[systemd-commits] src/selinux-setup.c

[Michael Biebl]

 src/selinux-setup.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 25bafad67f6f161921c498a7b77f118920bec971
Author: Michael Biebl <biebl at debian.org>
Date:   Fri Jul 1 05:55:57 2011 +0200

    Don't show a warning message in non-enforcing mode.
    
    If we fail to load the SELinux policy only log an error message in
    enforcing mode.

diff --git a/src/selinux-setup.c b/src/selinux-setup.c
index 620c49e..bc36e76 100644
--- a/src/selinux-setup.c
+++ b/src/selinux-setup.c
@@ -72,12 +72,13 @@ int selinux_setup(char *const argv[]) {
                return -errno;
 
        } else {
-               log_full(enforce > 0 ? LOG_ERR : LOG_WARNING, "Failed to load SELinux policy.");
 
                unlink("/dev/.systemd-relabel-run-dev");
 
-               if (enforce > 0)
+               if (enforce > 0) {
+                       log_full(LOG_ERR, "Failed to load SELinux policy.");
                        return -EIO;
+               }
        }
 #endif