X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fselinux-setup.c;h=0723d7c8ba4786ecd9937ca3fb2bb6e3396dec2e;hb=e62d8c394474;hp=d8643bc16242d8b893bb2cbad71e16bdbd820668;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8;p=elogind.git

diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c
index d8643bc16..0723d7c8b 100644
--- a/src/core/selinux-setup.c
+++ b/src/core/selinux-setup.c
@@ -30,11 +30,18 @@
 #endif
 
 #include "selinux-setup.h"
+#include "selinux-util.h"
+#include "label.h"
 #include "mount-setup.h"
 #include "macro.h"
 #include "util.h"
 #include "log.h"
-#include "label.h"
+
+#ifdef HAVE_SELINUX
+static int null_log(int type, const char *fmt, ...) {
+        return 0;
+}
+#endif
 
 int selinux_setup(bool *loaded_policy) {
 
@@ -43,11 +50,13 @@ int selinux_setup(bool *loaded_policy) {
        usec_t before_load, after_load;
        security_context_t con;
        int r;
+       union selinux_callback cb;
 
        assert(loaded_policy);
 
-       /* Make sure getcon() works, which needs /proc and /sys */
-       mount_setup_early();
+       /* Turn off all of SELinux' own logging, we want to do that */
+       cb.func_log = null_log;
+       selinux_set_callback(SELINUX_CB_LOG, cb);
 
        /* Already initialized by somebody else? */
        r = getcon_raw(&con);
@@ -68,12 +77,11 @@ int selinux_setup(bool *loaded_policy) {
        /* Now load the policy */
        before_load = now(CLOCK_MONOTONIC);
        r = selinux_init_load_policy(&enforce);
-
        if (r == 0) {
                char timespan[FORMAT_TIMESPAN_MAX];
                char *label;
 
-               label_retest_selinux();
+               retest_selinux();
 
                /* Transition to the new context */
                r = label_get_create_label_from_exe(SYSTEMD_BINARY_PATH, &label);