diff options
| author | Joe Orton <jorton@redhat.com> | 2012-05-23 22:48:18 +0100 |
|---|---|---|
| committer | Joe Orton <jorton@redhat.com> | 2012-05-23 22:48:18 +0100 |
| commit | d3d3699597e6cd3f95fe80e7bbcd7297af2df8ac (patch) | |
| tree | eb1c821db921e3cbb04dd8ffb00bdb5c6a3f1902 /httpd-2.4.1-suenable.patch | |
| parent | 22bfb45d02fc897c56552f7da209119f00123143 (diff) | |
| download | httpd-d3d3699597e6cd3f95fe80e7bbcd7297af2df8ac.tar.gz httpd-d3d3699597e6cd3f95fe80e7bbcd7297af2df8ac.tar.xz httpd-d3d3699597e6cd3f95fe80e7bbcd7297af2df8ac.zip | |
suexec: use upstream version of patch for capability bit support
Diffstat (limited to 'httpd-2.4.1-suenable.patch')
| -rw-r--r-- | httpd-2.4.1-suenable.patch | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/httpd-2.4.1-suenable.patch b/httpd-2.4.1-suenable.patch deleted file mode 100644 index f2287fd..0000000 --- a/httpd-2.4.1-suenable.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 = ""; |
