From a1252f96e30ea1656ec99a54fa17780728873c0f Mon Sep 17 00:00:00 2001 From: Nick Kew Date: Mon, 3 Nov 2008 11:37:03 +0000 Subject: [PATCH] Wrap the global count of privileges handlers operating. Silence grumblers. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@710037 13f79535-47bb-0310-9956-ffa450edef68 --- include/mpm_common.h | 2 +- modules/arch/unix/mod_unixd.c | 2 +- server/core.c | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/mpm_common.h b/include/mpm_common.h index 91bb1902e7..82ab37ca55 100644 --- a/include/mpm_common.h +++ b/include/mpm_common.h @@ -365,7 +365,7 @@ extern const char *ap_mpm_set_exception_hook(cmd_parms *cmd, void *dummy, AP_DECLARE_HOOK(int,monitor,(apr_pool_t *p)) /* register modules that undertake to manage system security */ -extern int sys_privileges; +AP_DECLARE(int) sys_privileges_handlers(int inc); AP_DECLARE_HOOK(int, drop_privileges, (apr_pool_t * pchild, server_rec * s)) #ifdef __cplusplus diff --git a/modules/arch/unix/mod_unixd.c b/modules/arch/unix/mod_unixd.c index 1a443f023f..487748bdf8 100644 --- a/modules/arch/unix/mod_unixd.c +++ b/modules/arch/unix/mod_unixd.c @@ -279,7 +279,7 @@ unixd_pre_config(apr_pool_t *pconf, apr_pool_t *plog, unixd_config.chroot_dir = NULL; /* none */ - ++sys_privileges; + sys_privileges_handlers(1); return OK; } diff --git a/server/core.c b/server/core.c index c47fa5b534..3ab3a71d47 100644 --- a/server/core.c +++ b/server/core.c @@ -3887,7 +3887,12 @@ static int core_pre_connection(conn_rec *c, void *csd) /* Insist that at least one module will undertake to provide system * security by dropping startup privileges. */ -AP_DECLARE(int) sys_privileges = 0; +static int sys_privileges = 0; +AP_DECLARE(int) sys_privileges_handlers(int inc) +{ + sys_privileges += inc; + return sys_privileges; +} static int core_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp) { if (!sys_privileges) { -- 2.50.1