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

diff --git a/include/mpm_common.h b/include/mpm_common.h
index 91bb1902e76eb04f3178570d73db50c0c65c4e1e..82ab37ca554ef4961a57dfb96d99276e898dab68 100644 (file)
--- 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 1a443f023f17fc5c537ccb359ca2b50377576985..487748bdf8554f318055cd791e9096939a5119cc 100644 (file)
--- 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 c47fa5b5345d10ca95206f0d10df478cc06632fb..3ab3a71d47a09c6b8b7e25205ef0cf5d30a98de8 100644 (file)
--- 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) {