Commit adc039fb authored by Eric Covener's avatar Eric Covener
Browse files

unixd_config/ap_unixd_config rename for mod_privileges 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723078 13f79535-47bb-0310-9956-ffa450edef68
parent 9f5b0704

modules/arch/unix/mod_privileges.c

+3 −3
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static apr_status_t privileges_end_req(void *data) 
                                         &privileges_module);



    /* ugly hack: grab default uid and gid from unixd */

    extern unixd_config_rec unixd_config;

    extern unixd_config_rec ap_unixd_config;



    /* if either user or group are not the default, restore them */

    if (cfg->uid || cfg->gid) {
@@ -108,11 +108,11 @@ static apr_status_t privileges_end_req(void *data) 
            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                          "PRIV_ON failed restoring default user/group");

        }

        if (cfg->uid && (setuid(unixd_config.user_id) == -1)) {

        if (cfg->uid && (setuid(ap_unixd_config.user_id) == -1)) {

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                          "Error restoring default userid");

        }

        if (cfg->gid && (setgid(unixd_config.group_id) == -1)) {

        if (cfg->gid && (setgid(ap_unixd_config.group_id) == -1)) {

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                          "Error restoring default group");

        }