httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r723078 - /httpd/httpd/trunk/modules/arch/unix/mod_privileges.c
Date Wed, 03 Dec 2008 21:14:50 GMT
Author: covener
Date: Wed Dec  3 13:14:50 2008
New Revision: 723078

URL: http://svn.apache.org/viewvc?rev=723078&view=rev
Log:
unixd_config/ap_unixd_config rename for mod_privileges

Modified:
    httpd/httpd/trunk/modules/arch/unix/mod_privileges.c

Modified: httpd/httpd/trunk/modules/arch/unix/mod_privileges.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/unix/mod_privileges.c?rev=723078&r1=723077&r2=723078&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/unix/mod_privileges.c (original)
+++ httpd/httpd/trunk/modules/arch/unix/mod_privileges.c Wed Dec  3 13:14:50 2008
@@ -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");
         }



Mime
View raw message