Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 41585 invoked from network); 24 Apr 2004 19:42:55 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 24 Apr 2004 19:42:55 -0000 Received: (qmail 66773 invoked by uid 500); 24 Apr 2004 19:42:43 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 66751 invoked by uid 500); 24 Apr 2004 19:42:43 -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: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 66724 invoked by uid 500); 24 Apr 2004 19:42:43 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 66691 invoked from network); 24 Apr 2004 19:42:42 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 24 Apr 2004 19:42:42 -0000 Received: (qmail 41355 invoked by uid 1569); 24 Apr 2004 19:42:52 -0000 Date: 24 Apr 2004 19:42:52 -0000 Message-ID: <20040424194252.41354.qmail@minotaur.apache.org> From: nd@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/os/unix unixd.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N nd 2004/04/24 12:42:52 Modified: os/unix unixd.c Log: readd suexec setuid and user check Related to PR: 28287 Revision Changes Path 1.69 +2 -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.68 retrieving revision 1.69 diff -u -u -r1.68 -r1.69 --- unixd.c 19 Mar 2004 11:16:03 -0000 1.68 +++ unixd.c 24 Apr 2004 19:42:52 -0000 1.69 @@ -213,10 +213,9 @@ return; } - /* XXX - apr_stat is incapable of checking suid bits (grumble) */ - /* if ((wrapper.filetype & S_ISUID) && wrapper.user == 0) { */ + if ((wrapper.protection & APR_USETID) && wrapper.user == 0) { unixd_config.suexec_enabled = 1; - /* } */ + } }