X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fcondition.c;h=da7560f05fb616f2176f7c2a389bb61b8a2591e1;hb=d01efa07444e49aafd78e0aa822168da688d53f5;hp=59f262244b202a3f7aa6bc72ed13e5ea023bea18;hpb=8b5e2af10830d55b2032e6c79d0cd1f959bb5b7f;p=elogind.git diff --git a/src/shared/condition.c b/src/shared/condition.c index 59f262244..da7560f05 100644 --- a/src/shared/condition.c +++ b/src/shared/condition.c @@ -31,7 +31,6 @@ #include "virt.h" #include "path-util.h" #include "fileio.h" -#include "unit.h" #include "architecture.h" #include "smack-util.h" #include "apparmor-util.h" @@ -39,6 +38,7 @@ #include "selinux-util.h" #include "audit.h" #include "condition.h" +#include "cap-list.h" Condition* condition_new(ConditionType type, const char *parameter, bool trigger, bool negate) { Condition *c; @@ -72,11 +72,13 @@ void condition_free(Condition *c) { free(c); } -void condition_free_list(Condition *first) { +Condition* condition_free_list(Condition *first) { Condition *c, *n; LIST_FOREACH_SAFE(conditions, c, n, first) condition_free(c); + + return NULL; } static int condition_test_kernel_command_line(Condition *c) { @@ -235,7 +237,7 @@ static int condition_test_security(Condition *c) { static int condition_test_capability(Condition *c) { _cleanup_fclose_ FILE *f = NULL; - cap_value_t value; + int value; char line[LINE_MAX]; unsigned long long capabilities = -1; @@ -244,8 +246,8 @@ static int condition_test_capability(Condition *c) { assert(c->type == CONDITION_CAPABILITY); /* If it's an invalid capability, we don't have it */ - - if (cap_from_name(c->parameter, &value) < 0) + value = capability_from_name(c->parameter); + if (value < 0) return -EINVAL; /* If it's a valid capability we default to assume @@ -286,7 +288,7 @@ static int condition_test_needs_update(Condition *c) { if (!path_is_absolute(c->parameter)) return true; - p = strappenda(c->parameter, "/.updated"); + p = strjoina(c->parameter, "/.updated"); if (lstat(p, &other) < 0) return true;