X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fcondition.c;h=436e7840d0e63a35883d9195565183a4bde384d6;hb=08c6f819cb0ed435649583da02fa0de965b32dbe;hp=2fbc5ad0e6914534ca2173c3fd06b7f1ab751266;hpb=4b744dfabebd10bf0f13b64060f44b1bd6c82704;p=elogind.git

diff --git a/src/core/condition.c b/src/core/condition.c
index 2fbc5ad0e..436e7840d 100644
--- a/src/core/condition.c
+++ b/src/core/condition.c
@@ -27,10 +27,6 @@
 #include <sys/statvfs.h>
 #include <fnmatch.h>
 
-#ifdef HAVE_SELINUX
-#include <selinux/selinux.h>
-#endif
-
 #include <systemd/sd-id128.h>
 #include "util.h"
 #include "condition.h"
@@ -38,6 +34,10 @@
 #include "path-util.h"
 #include "fileio.h"
 #include "unit.h"
+#include "smack-util.h"
+#include "apparmor-util.h"
+#include "ima-util.h"
+#include "selinux-util.h"
 
 Condition* condition_new(ConditionType type, const char *parameter, bool trigger, bool negate) {
         Condition *c;
@@ -86,14 +86,11 @@ static bool test_kernel_command_line(const char *parameter) {
 
         assert(parameter);
 
-        if (detect_container(NULL) > 0)
-                return false;
-
-        r = read_one_line_file("/proc/cmdline", &line);
-        if (r < 0) {
+        r = proc_cmdline(&line);
+        if (r < 0)
                 log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
+        if (r <= 0)
                 return false;
-        }
 
         equal = !!strchr(parameter, '=');
         pl = strlen(parameter);
@@ -158,28 +155,15 @@ static bool test_virtualization(const char *parameter) {
         return v > 0 && streq(parameter, id);
 }
 
-static bool test_apparmor_enabled(void) {
-        int r;
-        _cleanup_free_ char *p = NULL;
-
-        r = read_one_line_file("/sys/module/apparmor/parameters/enabled", &p);
-        if (r < 0)
-                return false;
-
-        return parse_boolean(p) > 0;
-}
-
 static bool test_security(const char *parameter) {
-#ifdef HAVE_SELINUX
         if (streq(parameter, "selinux"))
-                return is_selinux_enabled() > 0;
-#endif
+                return use_selinux();
         if (streq(parameter, "apparmor"))
-                return test_apparmor_enabled();
+                return use_apparmor();
         if (streq(parameter, "ima"))
-                return access("/sys/kernel/security/ima/", F_OK) == 0;
+                return use_ima();
         if (streq(parameter, "smack"))
-                return access("/sys/fs/smackfs", F_OK) == 0;
+                return use_smack();
         return false;
 }
 
@@ -250,7 +234,7 @@ static bool test_ac_power(const char *parameter) {
         return (on_ac_power() != 0) == !!r;
 }
 
-bool condition_test(Condition *c) {
+static bool condition_test(Condition *c) {
         assert(c);
 
         switch(c->type) {
@@ -358,6 +342,7 @@ bool condition_test_list(const char *unit, Condition *first) {
                                        c->parameter,
                                        b ? "succeeded" : "failed",
                                        unit);
+                c->state = b ? 1 : -1;
 
                 if (!c->trigger && !b)
                         return false;
@@ -377,12 +362,13 @@ void condition_dump(Condition *c, FILE *f, const char *prefix) {
                 prefix = "";
 
         fprintf(f,
-                "%s\t%s: %s%s%s\n",
+                "%s\t%s: %s%s%s %s\n",
                 prefix,
                 condition_type_to_string(c->type),
                 c->trigger ? "|" : "",
                 c->negate ? "!" : "",
-                c->parameter);
+                c->parameter,
+                c->state < 0 ? "failed" : c->state > 0 ? "succeeded" : "untested");
 }
 
 void condition_dump_list(Condition *first, FILE *f, const char *prefix) {