Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 51702 invoked from network); 3 Dec 2008 21:15:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Dec 2008 21:15:42 -0000 Received: (qmail 23471 invoked by uid 500); 3 Dec 2008 21:15:53 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 23414 invoked by uid 500); 3 Dec 2008 21:15:53 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 23405 invoked by uid 99); 3 Dec 2008 21:15:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Dec 2008 13:15:53 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Dec 2008 21:14:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 03B8623888EB; Wed, 3 Dec 2008 13:14:51 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r723078 - /httpd/httpd/trunk/modules/arch/unix/mod_privileges.c Date: Wed, 03 Dec 2008 21:14:50 -0000 To: cvs@httpd.apache.org From: covener@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081203211451.03B8623888EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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"); }