Diff of /httpd/httpd/trunk/modules/arch/unix/mod_privileges.c

Parent Directory | Revision Log | Patch

--- httpd/httpd/trunk/modules/arch/unix/mod_privileges.c	2008/11/16 12:43:06	718015
+++ httpd/httpd/trunk/modules/arch/unix/mod_privileges.c	2008/12/03 21:14:50	723078
@@ -100,7 +100,7 @@
                                          &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 @@
             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");
         }