chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: rework message handlers to always take an error argument
[elogind.git]
/
src
/
core
/
condition.c
diff --git
a/src/core/condition.c
b/src/core/condition.c
index 6c387450afdd5d2aea3d7798a55e17e0de3e5db7..436e7840d0e63a35883d9195565183a4bde384d6 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;
@@
-86,14
+86,11
@@
static bool test_kernel_command_line(const char *parameter) {
assert(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));
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
+ if (r <= 0)
return false;
return false;
- }
equal = !!strchr(parameter, '=');
pl = strlen(parameter);
equal = !!strchr(parameter, '=');
pl = strlen(parameter);
@@
-158,28
+155,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;
}