From c711ee8af9f094852c6d1917a0b111a276e7b320 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 24 Mar 2012 08:24:02 +0100 Subject: httpd: import from rawhide (version 2.4.1) --- httpd-2.4.1-suenable.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 httpd-2.4.1-suenable.patch (limited to 'httpd-2.4.1-suenable.patch') diff --git a/httpd-2.4.1-suenable.patch b/httpd-2.4.1-suenable.patch new file mode 100644 index 0000000..f2287fd --- /dev/null +++ b/httpd-2.4.1-suenable.patch @@ -0,0 +1,18 @@ +Removes setuid check because we are now using capabilities to ensure proper +suexec rights. + +Upstream-status: vendor specific. + +diff --git a/os/unix/unixd.c b/os/unix/unixd.c +index 85d5a98..1ee1dfe 100644 +--- httpd-2.4.1/modules/arch/unix/mod_unixd.c.suenable ++++ httpd-2.4.1/modules/arch/unix/mod_unixd.c +@@ -300,7 +300,7 @@ unixd_pre_config(apr_pool_t *pconf, apr_ + ap_unixd_config.suexec_enabled = 0; + if ((apr_stat(&wrapper, SUEXEC_BIN, APR_FINFO_NORM, ptemp)) + == APR_SUCCESS) { +- if ((wrapper.protection & APR_USETID) && wrapper.user == 0 ++ if (wrapper.user == 0 + && (access(SUEXEC_BIN, R_OK|X_OK) == 0)) { + ap_unixd_config.suexec_enabled = 1; + ap_unixd_config.suexec_disabled_reason = ""; -- cgit