Commit 22fa299f authored by Nick Kew's avatar Nick Kew
Browse files

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
parent ea4c5be4

include/mpm_common.h

+1 −1
Original line number Diff line number Diff line
@@ -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

modules/arch/unix/mod_unixd.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

server/core.c

+6 −1
Original line number Diff line number Diff line
@@ -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) {