diff options
author | jorton <jorton@fedoraproject.org> | 2008-12-18 16:30:24 +0000 |
---|---|---|
committer | jorton <jorton@fedoraproject.org> | 2008-12-18 16:30:24 +0000 |
commit | 110f0ad2292fecfe35efac3c4f87a3be90f7eeaa (patch) | |
tree | 5e94f6c9791ad47bb5cc099d30c8a36c0085d2f2 /httpd-2.2.11-selinux.patch | |
parent | 5256a64e5faf3fe494f7e8a311365046f6fd8e15 (diff) | |
download | httpd-110f0ad2292fecfe35efac3c4f87a3be90f7eeaa.tar.gz httpd-110f0ad2292fecfe35efac3c4f87a3be90f7eeaa.tar.xz httpd-110f0ad2292fecfe35efac3c4f87a3be90f7eeaa.zip |
- update to 2.2.11httpd-2_2_11-3
- package new /var/run/httpd directory, and move default pidfile location
inside there
Diffstat (limited to 'httpd-2.2.11-selinux.patch')
-rw-r--r-- | httpd-2.2.11-selinux.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/httpd-2.2.11-selinux.patch b/httpd-2.2.11-selinux.patch new file mode 100644 index 0000000..7b1b3cb --- /dev/null +++ b/httpd-2.2.11-selinux.patch @@ -0,0 +1,51 @@ +--- httpd-2.2.11/configure.in.selinux ++++ httpd-2.2.11/configure.in +@@ -412,6 +412,10 @@ getpgid + dnl confirm that a void pointer is large enough to store a long integer + APACHE_CHECK_VOID_PTR_LEN + ++AC_CHECK_LIB(selinux, is_selinux_enabled, [ ++ APR_ADDTO(AP_LIBS, [-lselinux]) ++]) ++ + dnl ## Check for the tm_gmtoff field in struct tm to get the timezone diffs + AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff, + [AC_TRY_COMPILE([#include <sys/types.h> +--- httpd-2.2.11/server/core.c.selinux ++++ httpd-2.2.11/server/core.c +@@ -51,6 +51,8 @@ + + #include "mod_so.h" /* for ap_find_loaded_module_symbol */ + ++#include <selinux/selinux.h> ++ + /* LimitRequestBody handling */ + #define AP_LIMIT_REQ_BODY_UNSET ((apr_off_t) -1) + #define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 0) +@@ -3796,6 +3798,26 @@ static int core_post_config(apr_pool_t * + } + #endif + ++ { ++ static int already_warned = 0; ++ int is_enabled = is_selinux_enabled() > 0; ++ ++ if (is_enabled && !already_warned) { ++ security_context_t con; ++ ++ if (getcon(&con) == 0) { ++ ++ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL, ++ "SELinux policy enabled; " ++ "httpd running as context %s", con); ++ ++ already_warned = 1; ++ ++ freecon(con); ++ } ++ } ++ } ++ + return OK; + } + |