You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2004/05/27 01:03:13 UTC
cvs commit: httpd-2.0/os/unix unixd.c
nd 2004/05/26 16:03:13
Modified: . Tag: APACHE_2_0_BRANCH CHANGES STATUS
os/unix Tag: APACHE_2_0_BRANCH unixd.c
Log:
Readd suexec setuid and user check (now APR supports it)
Reviewed by: Jeff Trawick, Joe Orton
Revision Changes Path
No revision
No revision
1.988.2.287 +5 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.286
retrieving revision 1.988.2.287
diff -u -u -r1.988.2.286 -r1.988.2.287
--- CHANGES 26 May 2004 12:22:14 -0000 1.988.2.286
+++ CHANGES 26 May 2004 23:03:12 -0000 1.988.2.287
@@ -1,5 +1,10 @@
Changes with Apache 2.0.50
+ *) Regression from 1.3: At startup, suexec now will be checked for
+ availability, the setuid bit and user root. The works only if
+ httpd is compiled with the shipped APR version (0.9.5).
+ [Andr� Malo]
+
*) Unix MPMs: Stop dropping connections when the file descriptor
is at least FD_SETSIZE. [Jeff Trawick]
1.751.2.889 +1 -7 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.888
retrieving revision 1.751.2.889
diff -u -u -r1.751.2.888 -r1.751.2.889
--- STATUS 26 May 2004 18:08:34 -0000 1.751.2.888
+++ STATUS 26 May 2004 23:03:12 -0000 1.751.2.889
@@ -117,12 +117,6 @@
PR: 22030, 18348
+1: jorton, trawick
- *) Readd suexec setuid and user check (now APR supports it)
- os/unix/unixd.c: r1.69
- +1: nd, trawick
- +1: jorton, if surrounded with #ifdef APR_USETID to retain
- compatibility with APR <0.9.5
-
*) Prevent Win32 pool corruption at startup
server/mpm/winnt/child.c: r1.36
+1: ake, trawick, nd
No revision
No revision
1.55.2.10 +7 -3 httpd-2.0/os/unix/unixd.c
Index: unixd.c
===================================================================
RCS file: /home/cvs/httpd-2.0/os/unix/unixd.c,v
retrieving revision 1.55.2.9
retrieving revision 1.55.2.10
diff -u -u -r1.55.2.9 -r1.55.2.10
--- unixd.c 26 May 2004 12:22:16 -0000 1.55.2.9
+++ unixd.c 26 May 2004 23:03:13 -0000 1.55.2.10
@@ -213,10 +213,14 @@
return;
}
- /* XXX - apr_stat is incapable of checking suid bits (grumble) */
- /* if ((wrapper.filetype & S_ISUID) && wrapper.user == 0) { */
+/* since APR 0.9.5 */
+#ifdef APR_USETID
+ if ((wrapper.protection & APR_USETID) && wrapper.user == 0) {
+#endif
unixd_config.suexec_enabled = 1;
- /* } */
+#ifdef APR_USETID
+ }
+#endif
}