Merge pull request #2053 from poettering/selinux-fix

Two unrelated fixes
2015-11-30 19:30:03 +01:00
parent a00405285e 20ba6c2ebe
commit de418eb91c
10 changed files with 28 additions and 17 deletions
@@ -231,7 +231,7 @@ static int condition_test_security(Condition *c) {
        assert(c->type == CONDITION_SECURITY);

        if (streq(c->parameter, "selinux"))
-                return mac_selinux_use();
+                return mac_selinux_have();
        if (streq(c->parameter, "smack"))
                return mac_smack_use();
        if (streq(c->parameter, "apparmor"))