httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From taka...@apache.org
Subject svn commit: r1618778 - /httpd/httpd/trunk/modules/arch/unix/mod_unixd.c
Date Tue, 19 Aug 2014 01:27:38 GMT
Author: takashi
Date: Tue Aug 19 01:27:38 2014
New Revision: 1618778

URL: http://svn.apache.org/r1618778
Log:
Follow up r1617201:
Return EPERM if the uid is not root on chroot-ing.

Pointed out by trawick on
<CAKUrXK6EGmG1ZD4+UFZ05yznTe6twOU3n57YeO-Ney-_VV_dCQ@mail.gmail.com>

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

Modified: httpd/httpd/trunk/modules/arch/unix/mod_unixd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/unix/mod_unixd.c?rev=1618778&r1=1618777&r2=1618778&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/unix/mod_unixd.c (original)
+++ httpd/httpd/trunk/modules/arch/unix/mod_unixd.c Tue Aug 19 01:27:38 2014
@@ -152,7 +152,7 @@ AP_DECLARE(int) ap_unixd_setup_child(voi
         if (geteuid()) {
             ap_log_error(APLOG_MARK, APLOG_ALERT, 0, NULL, APLOGNO(02158)
                          "Cannot chroot when not started as root");
-            return rv;
+            return EPERM;
         }
 
         if (chdir(ap_unixd_config.chroot_dir) != 0) {



Mime
View raw message