|
 |
576df0 |
|
|
|
576df0 |
Log the SELinux context at startup.
|
|
|
576df0 |
|
|
|
576df0 |
Upstream-Status: unlikely to be any interest in this upstream
|
|
|
576df0 |
|
|
|
576df0 |
diff --git a/configure.in b/configure.in
|
|
|
576df0 |
index eedba50..a208b53 100644
|
|
|
576df0 |
--- a/configure.in
|
|
|
576df0 |
+++ b/configure.in
|
|
|
576df0 |
@@ -484,6 +484,11 @@ getloadavg
|
|
|
576df0 |
dnl confirm that a void pointer is large enough to store a long integer
|
|
|
576df0 |
APACHE_CHECK_VOID_PTR_LEN
|
|
|
576df0 |
|
|
|
576df0 |
+AC_CHECK_LIB(selinux, is_selinux_enabled, [
|
|
|
576df0 |
+ AC_DEFINE(HAVE_SELINUX, 1, [Defined if SELinux is supported])
|
|
|
576df0 |
+ APR_ADDTO(HTTPD_LIBS, [-lselinux])
|
|
|
576df0 |
+])
|
|
|
576df0 |
+
|
|
|
576df0 |
AC_CACHE_CHECK([for gettid()], ac_cv_gettid,
|
|
|
576df0 |
[AC_TRY_RUN(#define _GNU_SOURCE
|
|
|
576df0 |
#include <unistd.h>
|
|
|
576df0 |
diff --git a/server/core.c b/server/core.c
|
|
|
576df0 |
index ec74029..cb8e463 100644
|
|
|
576df0 |
--- a/server/core.c
|
|
|
576df0 |
+++ b/server/core.c
|
|
|
576df0 |
@@ -59,6 +59,10 @@
|
|
|
576df0 |
#include <unistd.h>
|
|
|
576df0 |
#endif
|
|
|
576df0 |
|
|
|
576df0 |
+#ifdef HAVE_SELINUX
|
|
|
576df0 |
+#include <selinux/selinux.h>
|
|
|
576df0 |
+#endif
|
|
|
576df0 |
+
|
|
|
576df0 |
/* LimitRequestBody handling */
|
|
|
576df0 |
#define AP_LIMIT_REQ_BODY_UNSET ((apr_off_t) -1)
|
|
|
576df0 |
#define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 0)
|
|
|
576df0 |
@@ -4971,6 +4975,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
|
|
|
576df0 |
}
|
|
|
576df0 |
#endif
|
|
|
576df0 |
|
|
|
576df0 |
+#ifdef HAVE_SELINUX
|
|
|
576df0 |
+ {
|
|
|
576df0 |
+ static int already_warned = 0;
|
|
|
576df0 |
+ int is_enabled = is_selinux_enabled() > 0;
|
|
|
576df0 |
+
|
|
|
576df0 |
+ if (is_enabled && !already_warned) {
|
|
|
576df0 |
+ security_context_t con;
|
|
|
576df0 |
+
|
|
|
576df0 |
+ if (getcon(&con) == 0) {
|
|
|
576df0 |
+
|
|
|
576df0 |
+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL,
|
|
|
576df0 |
+ "SELinux policy enabled; "
|
|
|
576df0 |
+ "httpd running as context %s", con);
|
|
|
576df0 |
+
|
|
|
576df0 |
+ already_warned = 1;
|
|
|
576df0 |
+
|
|
|
576df0 |
+ freecon(con);
|
|
|
576df0 |
+ }
|
|
|
576df0 |
+ }
|
|
|
576df0 |
+ }
|
|
|
576df0 |
+#endif
|
|
|
576df0 |
+
|
|
|
576df0 |
return OK;
|
|
|
576df0 |
}
|
|
|
576df0 |
|