unit-printf: add specifiers for the host name, machine id, boot id

[elogind.git] / src / core / selinux-setup.c

diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c
index d8643bc16242d8b893bb2cbad71e16bdbd820668..52df7a7221f98c54256589ff45feedf87c63bc2e 100644 (file)
--- a/src/core/selinux-setup.c
+++ b/src/core/selinux-setup.c
@@ -36,6 +36,12 @@
 #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) {
 
 #ifdef HAVE_SELINUX
@@ -43,9 +49,14 @@ 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);
 
+       /* Turn off all of SELinux' own logging, we want to do that */
+       cb.func_log = null_log;
+       selinux_set_callback(SELINUX_CB_LOG, cb);
+
        /* Make sure getcon() works, which needs /proc and /sys */
        mount_setup_early();
 
@@ -68,7 +79,6 @@ 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;