chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
smack: minimize ifdef use, and move all labeling to smack-util.c
[elogind.git]
/
src
/
core
/
condition.c
diff --git
a/src/core/condition.c
b/src/core/condition.c
index 2fbc5ad0e6914534ca2173c3fd06b7f1ab751266..c53d4066822cffd741412f85271cf8f294eaf329 100644
(file)
--- a/
src/core/condition.c
+++ b/
src/core/condition.c
@@
-27,10
+27,6
@@
#include <sys/statvfs.h>
#include <fnmatch.h>
#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"
#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 "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;
Condition* condition_new(ConditionType type, const char *parameter, bool trigger, bool negate) {
Condition *c;
@@
-158,28
+158,15
@@
static bool test_virtualization(const char *parameter) {
return v > 0 && streq(parameter, id);
}
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) {
static bool test_security(const char *parameter) {
-#ifdef HAVE_SELINUX
if (streq(parameter, "selinux"))
if (streq(parameter, "selinux"))
- return is_selinux_enabled() > 0;
-#endif
+ return use_selinux();
if (streq(parameter, "apparmor"))
if (streq(parameter, "apparmor"))
- return
test_apparmor_enabled
();
+ return
use_apparmor
();
if (streq(parameter, "ima"))
if (streq(parameter, "ima"))
- return
access("/sys/kernel/security/ima/", F_OK) == 0
;
+ return
use_ima()
;
if (streq(parameter, "smack"))
if (streq(parameter, "smack"))
- return
access("/sys/fs/smackfs", F_OK) == 0
;
+ return
use_smack()
;
return false;
}
return false;
}
@@
-250,7
+237,7
@@
static bool test_ac_power(const char *parameter) {
return (on_ac_power() != 0) == !!r;
}
return (on_ac_power() != 0) == !!r;
}
-bool condition_test(Condition *c) {
+
static
bool condition_test(Condition *c) {
assert(c);
switch(c->type) {
assert(c);
switch(c->type) {
@@
-358,6
+345,7
@@
bool condition_test_list(const char *unit, Condition *first) {
c->parameter,
b ? "succeeded" : "failed",
unit);
c->parameter,
b ? "succeeded" : "failed",
unit);
+ c->state = b ? 1 : -1;
if (!c->trigger && !b)
return false;
if (!c->trigger && !b)
return false;
@@
-377,12
+365,13
@@
void condition_dump(Condition *c, FILE *f, const char *prefix) {
prefix = "";
fprintf(f,
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 ? "!" : "",
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) {
}
void condition_dump_list(Condition *first, FILE *f, const char *prefix) {