X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fload-fragment.c;h=8436d4f95ef1e9224ae5b7d22d98b6f2a4e3b8fc;hp=3bc053341c5a8bdac65e4e4bc00590b51f7e401d;hb=843fc7f7f26a6507fe896a79ed1b474c35c4300f;hpb=49dbfa7b2b0bf3906704dac1eaeb4eba91056a19 diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 3bc053341..8436d4f95 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -4,6 +4,7 @@ This file is part of systemd. Copyright 2010 Lennart Poettering + Copyright 2012 Holger Hans Peter Freyther systemd is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -42,9 +43,11 @@ #include "securebits.h" #include "missing.h" #include "unit-name.h" +#include "unit-printf.h" #include "bus-errors.h" #include "utf8.h" #include "path-util.h" +#include "syscall-list.h" #ifndef HAVE_SYSV_COMPAT int config_parse_warn_compat( @@ -83,66 +86,21 @@ int config_parse_unit_deps( assert(rvalue); FOREACH_WORD_QUOTED(w, l, rvalue, state) { - char *t, *k; + char _cleanup_free_ *t = NULL, *k = NULL; int r; t = strndup(w, l); if (!t) - return -ENOMEM; + return log_oom(); k = unit_name_printf(u, t); - free(t); if (!k) - return -ENOMEM; + return log_oom(); r = unit_add_dependency_by_name(u, d, k, NULL, true); if (r < 0) - log_error("[%s:%u] Failed to add dependency on %s, ignoring: %s", filename, line, k, strerror(-r)); - - free(k); - } - - return 0; -} - -int config_parse_unit_names( - const char *filename, - unsigned line, - const char *section, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { - - Unit *u = userdata; - char *w; - size_t l; - char *state; - - assert(filename); - assert(lvalue); - assert(rvalue); - assert(data); - - FOREACH_WORD_QUOTED(w, l, rvalue, state) { - char *t, *k; - int r; - - t = strndup(w, l); - if (!t) - return -ENOMEM; - - k = unit_name_printf(u, t); - free(t); - if (!k) - return -ENOMEM; - - r = unit_merge_by_name(u, k); - if (r < 0) - log_error("Failed to add name %s, ignoring: %s", k, strerror(-r)); - - free(k); + log_error("[%s:%u] Failed to add dependency on %s, ignoring: %s", + filename, line, k, strerror(-r)); } return 0; @@ -159,8 +117,7 @@ int config_parse_unit_string_printf( void *userdata) { Unit *u = userdata; - char *k; - int r; + _cleanup_free_ char *k = NULL; assert(filename); assert(lvalue); @@ -169,12 +126,9 @@ int config_parse_unit_string_printf( k = unit_full_printf(u, rvalue); if (!k) - return -ENOMEM; + return log_oom(); - r = config_parse_string(filename, line, section, lvalue, ltype, k, data, userdata); - free (k); - - return r; + return config_parse_string(filename, line, section, lvalue, ltype, k, data, userdata); } int config_parse_unit_strv_printf( @@ -188,8 +142,7 @@ int config_parse_unit_strv_printf( void *userdata) { Unit *u = userdata; - char *k; - int r; + _cleanup_free_ char *k = NULL; assert(filename); assert(lvalue); @@ -198,12 +151,9 @@ int config_parse_unit_strv_printf( k = unit_full_printf(u, rvalue); if (!k) - return -ENOMEM; - - r = config_parse_strv(filename, line, section, lvalue, ltype, k, data, userdata); - free(k); + return log_oom(); - return r; + return config_parse_strv(filename, line, section, lvalue, ltype, k, data, userdata); } int config_parse_unit_path_printf( @@ -217,8 +167,7 @@ int config_parse_unit_path_printf( void *userdata) { Unit *u = userdata; - char *k; - int r; + _cleanup_free_ char *k = NULL; assert(filename); assert(lvalue); @@ -227,12 +176,9 @@ int config_parse_unit_path_printf( k = unit_full_printf(u, rvalue); if (!k) - return -ENOMEM; + return log_oom(); - r = config_parse_path(filename, line, section, lvalue, ltype, k, data, userdata); - free(k); - - return r; + return config_parse_path(filename, line, section, lvalue, ltype, k, data, userdata); } int config_parse_socket_listen( @@ -255,50 +201,39 @@ int config_parse_socket_listen( s = SOCKET(data); + if (isempty(rvalue)) { + /* An empty assignment removes all ports */ + socket_free_ports(s); + return 0; + } + p = new0(SocketPort, 1); if (!p) - return -ENOMEM; - - if (streq(lvalue, "ListenFIFO")) { - p->type = SOCKET_FIFO; - - if (!(p->path = unit_full_printf(UNIT(s), rvalue))) { - free(p); - return -ENOMEM; - } - - path_kill_slashes(p->path); + return log_oom(); - } else if (streq(lvalue, "ListenSpecial")) { - p->type = SOCKET_SPECIAL; + if (ltype != SOCKET_SOCKET) { - if (!(p->path = unit_full_printf(UNIT(s), rvalue))) { + p->type = ltype; + p->path = unit_full_printf(UNIT(s), rvalue); + if (!p->path) { free(p); - return -ENOMEM; - } - - path_kill_slashes(p->path); - - } else if (streq(lvalue, "ListenMessageQueue")) { - - p->type = SOCKET_MQUEUE; - - if (!(p->path = unit_full_printf(UNIT(s), rvalue))) { - free(p); - return -ENOMEM; + return log_oom(); } path_kill_slashes(p->path); } else if (streq(lvalue, "ListenNetlink")) { - char *k; + _cleanup_free_ char *k = NULL; int r; p->type = SOCKET_SOCKET; k = unit_full_printf(UNIT(s), rvalue); - r = socket_address_parse_netlink(&p->address, k); - free(k); + if (!k) { + free(p); + return log_oom(); + } + r = socket_address_parse_netlink(&p->address, k); if (r < 0) { log_error("[%s:%u] Failed to parse address value, ignoring: %s", filename, line, rvalue); free(p); @@ -306,14 +241,17 @@ int config_parse_socket_listen( } } else { - char *k; + _cleanup_free_ char *k = NULL; int r; p->type = SOCKET_SOCKET; k = unit_full_printf(UNIT(s), rvalue); - r = socket_address_parse(&p->address, k); - free(k); + if (!k) { + free(p); + return log_oom(); + } + r = socket_address_parse(&p->address, k); if (r < 0) { log_error("[%s:%u] Failed to parse address value, ignoring: %s", filename, line, rvalue); free(p); @@ -367,10 +305,12 @@ int config_parse_socket_bind( s = SOCKET(data); - if ((b = socket_address_bind_ipv6_only_from_string(rvalue)) < 0) { + b = socket_address_bind_ipv6_only_from_string(rvalue); + if (b < 0) { int r; - if ((r = parse_boolean(rvalue)) < 0) { + r = parse_boolean(rvalue); + if (r < 0) { log_error("[%s:%u] Failed to parse bind IPv6 only value, ignoring: %s", filename, line, rvalue); return 0; } @@ -470,13 +410,20 @@ int config_parse_exec( assert(rvalue); assert(e); + e += ltype; + + if (isempty(rvalue)) { + /* An empty assignment resets the list */ + exec_command_free_list(*e); + *e = NULL; + return 0; + } + /* We accept an absolute path as first argument, or * alternatively an absolute prefixed with @ to allow * overriding of argv[0]. */ - - e += ltype; - for (;;) { + int i; char *w; size_t l; char *state; @@ -491,18 +438,21 @@ int config_parse_exec( if (rvalue[0] == 0) break; - if (rvalue[0] == '-') { - ignore = true; - rvalue ++; - } + for (i = 0; i < 2; i++) { + if (rvalue[0] == '-' && !ignore) { + ignore = true; + rvalue ++; + } - if (rvalue[0] == '@') { - honour_argv0 = true; - rvalue ++; + if (rvalue[0] == '@' && !honour_argv0) { + honour_argv0 = true; + rvalue ++; + } } if (*rvalue != '/') { - log_error("[%s:%u] Invalid executable path in command line, ignoring: %s", filename, line, rvalue); + log_error("[%s:%u] Executable path is not absolute, ignoring: %s", + filename, line, rvalue); return 0; } @@ -516,19 +466,21 @@ int config_parse_exec( n = new(char*, k + !honour_argv0); if (!n) - return -ENOMEM; + return log_oom(); k = 0; FOREACH_WORD_QUOTED(w, l, rvalue, state) { if (strncmp(w, ";", MAX(l, 1U)) == 0) break; + else if (strncmp(w, "\\;", MAX(l, 1U)) == 0) + w ++; if (honour_argv0 && w == rvalue) { assert(!path); path = strndup(w, l); if (!path) { - r = -ENOMEM; + r = log_oom(); goto fail; } @@ -543,7 +495,7 @@ int config_parse_exec( c = n[k++] = cunescape_length(w, l); if (!c) { - r = -ENOMEM; + r = log_oom(); goto fail; } @@ -566,7 +518,7 @@ int config_parse_exec( if (!path) { path = strdup(n[0]); if (!path) { - r = -ENOMEM; + r = log_oom(); goto fail; } } @@ -575,7 +527,7 @@ int config_parse_exec( nce = new0(ExecCommand, 1); if (!nce) { - r = -ENOMEM; + r = log_oom(); goto fail; } @@ -623,8 +575,9 @@ int config_parse_socket_bindtodevice( assert(data); if (rvalue[0] && !streq(rvalue, "*")) { - if (!(n = strdup(rvalue))) - return -ENOMEM; + n = strdup(rvalue); + if (!n) + return log_oom(); } else n = NULL; @@ -637,61 +590,6 @@ int config_parse_socket_bindtodevice( DEFINE_CONFIG_PARSE_ENUM(config_parse_output, exec_output, ExecOutput, "Failed to parse output specifier"); DEFINE_CONFIG_PARSE_ENUM(config_parse_input, exec_input, ExecInput, "Failed to parse input specifier"); -int config_parse_facility( - const char *filename, - unsigned line, - const char *section, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { - - - int *o = data, x; - - assert(filename); - assert(lvalue); - assert(rvalue); - assert(data); - - if ((x = log_facility_unshifted_from_string(rvalue)) < 0) { - log_error("[%s:%u] Failed to parse log facility, ignoring: %s", filename, line, rvalue); - return 0; - } - - *o = (x << 3) | LOG_PRI(*o); - - return 0; -} - -int config_parse_level( - const char *filename, - unsigned line, - const char *section, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { - - - int *o = data, x; - - assert(filename); - assert(lvalue); - assert(rvalue); - assert(data); - - if ((x = log_level_from_string(rvalue)) < 0) { - log_error("[%s:%u] Failed to parse log level, ignoring: %s", filename, line, rvalue); - return 0; - } - - *o = (*o & LOG_FACMASK) | x; - return 0; -} - int config_parse_exec_io_class( const char *filename, unsigned line, @@ -710,7 +608,8 @@ int config_parse_exec_io_class( assert(rvalue); assert(data); - if ((x = ioprio_class_from_string(rvalue)) < 0) { + x = ioprio_class_from_string(rvalue); + if (x < 0) { log_error("[%s:%u] Failed to parse IO scheduling class, ignoring: %s", filename, line, rvalue); return 0; } @@ -769,12 +668,15 @@ int config_parse_exec_cpu_sched_policy( assert(rvalue); assert(data); - if ((x = sched_policy_from_string(rvalue)) < 0) { + x = sched_policy_from_string(rvalue); + if (x < 0) { log_error("[%s:%u] Failed to parse CPU scheduling policy, ignoring: %s", filename, line, rvalue); return 0; } c->cpu_sched_policy = x; + /* Moving to or from real-time policy? We need to adjust the priority */ + c->cpu_sched_priority = CLAMP(c->cpu_sched_priority, sched_get_priority_min(x), sched_get_priority_max(x)); c->cpu_sched_set = true; return 0; @@ -791,19 +693,27 @@ int config_parse_exec_cpu_sched_prio( void *userdata) { ExecContext *c = data; - int i; + int i, min, max; assert(filename); assert(lvalue); assert(rvalue); assert(data); - /* On Linux RR/FIFO have the same range */ - if (safe_atoi(rvalue, &i) < 0 || i < sched_get_priority_min(SCHED_RR) || i > sched_get_priority_max(SCHED_RR)) { + if (safe_atoi(rvalue, &i) < 0) { log_error("[%s:%u] Failed to parse CPU scheduling priority, ignoring: %s", filename, line, rvalue); return 0; } + /* On Linux RR/FIFO range from 1 to 99 and OTHER/BATCH may only be 0 */ + min = sched_get_priority_min(c->cpu_sched_policy); + max = sched_get_priority_max(c->cpu_sched_policy); + + if (i < min || i > max) { + log_error("[%s:%u] CPU scheduling priority is out of range, ignoring: %s", filename, line, rvalue); + return 0; + } + c->cpu_sched_priority = i; c->cpu_sched_set = true; @@ -830,23 +740,34 @@ int config_parse_exec_cpu_affinity( assert(rvalue); assert(data); + if (isempty(rvalue)) { + /* An empty assignment resets the CPU list */ + if (c->cpuset) + CPU_FREE(c->cpuset); + c->cpuset = NULL; + return 0; + } + FOREACH_WORD_QUOTED(w, l, rvalue, state) { - char *t; + char _cleanup_free_ *t = NULL; int r; unsigned cpu; - if (!(t = strndup(w, l))) - return -ENOMEM; + t = strndup(w, l); + if (!t) + return log_oom(); r = safe_atou(t, &cpu); - free(t); - if (!(c->cpuset)) - if (!(c->cpuset = cpu_set_malloc(&c->cpuset_ncpus))) - return -ENOMEM; + if (!c->cpuset) { + c->cpuset = cpu_set_malloc(&c->cpuset_ncpus); + if (!c->cpuset) + return log_oom(); + } if (r < 0 || cpu >= c->cpuset_ncpus) { - log_error("[%s:%u] Failed to parse CPU affinity, ignoring: %s", filename, line, rvalue); + log_error("[%s:%u] Failed to parse CPU affinity %s, ignoring: %s", + filename, line, t, rvalue); return 0; } @@ -874,9 +795,10 @@ int config_parse_exec_capabilities( assert(rvalue); assert(data); - if (!(cap = cap_from_text(rvalue))) { + cap = cap_from_text(rvalue); + if (!cap) { if (errno == ENOMEM) - return -ENOMEM; + return log_oom(); log_error("[%s:%u] Failed to parse capabilities, ignoring: %s", filename, line, rvalue); return 0; @@ -909,6 +831,12 @@ int config_parse_exec_secure_bits( assert(rvalue); assert(data); + if (isempty(rvalue)) { + /* An empty assignment resets the field */ + c->secure_bits = 0; + return 0; + } + FOREACH_WORD_QUOTED(w, l, rvalue, state) { if (first_word(w, "keep-caps")) c->secure_bits |= SECURE_KEEP_CAPS; @@ -923,7 +851,8 @@ int config_parse_exec_secure_bits( else if (first_word(w, "noroot-locked")) c->secure_bits |= SECURE_NOROOT_LOCKED; else { - log_error("[%s:%u] Failed to parse secure bits, ignoring: %s", filename, line, rvalue); + log_error("[%s:%u] Failed to parse secure bits, ignoring: %s", + filename, line, rvalue); return 0; } } @@ -931,7 +860,7 @@ int config_parse_exec_secure_bits( return 0; } -int config_parse_exec_bounding_set( +int config_parse_bounding_set( const char *filename, unsigned line, const char *section, @@ -941,7 +870,7 @@ int config_parse_exec_bounding_set( void *data, void *userdata) { - ExecContext *c = data; + uint64_t *capability_bounding_set_drop = data; char *w; size_t l; char *state; @@ -953,6 +882,12 @@ int config_parse_exec_bounding_set( assert(rvalue); assert(data); + if (isempty(rvalue)) { + /* An empty assignment resets */ + *capability_bounding_set_drop = 0; + return 0; + } + if (rvalue[0] == '~') { invert = true; rvalue++; @@ -964,56 +899,28 @@ int config_parse_exec_bounding_set( * interface. */ FOREACH_WORD_QUOTED(w, l, rvalue, state) { - char *t; + char _cleanup_free_ *t = NULL; int r; cap_value_t cap; - if (!(t = strndup(w, l))) - return -ENOMEM; + t = strndup(w, l); + if (!t) + return log_oom(); r = cap_from_name(t, &cap); - free(t); - if (r < 0) { - log_error("[%s:%u] Failed to parse capability bounding set, ignoring: %s", filename, line, rvalue); - return 0; + log_error("[%s:%u] Failed to parse capability in bounding set, ignoring: %s", + filename, line, t); + continue; } sum |= ((uint64_t) 1ULL) << (uint64_t) cap; } if (invert) - c->capability_bounding_set_drop |= sum; + *capability_bounding_set_drop |= sum; else - c->capability_bounding_set_drop |= ~sum; - - return 0; -} - -int config_parse_exec_timer_slack_nsec( - const char *filename, - unsigned line, - const char *section, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { - - ExecContext *c = data; - unsigned long u; - - assert(filename); - assert(lvalue); - assert(rvalue); - assert(data); - - if (safe_atolu(rvalue, &u) < 0) { - log_error("[%s:%u] Failed to parse time slack value, ignoring: %s", filename, line, rvalue); - return 0; - } - - c->timer_slack_nsec = u; + *capability_bounding_set_drop |= ~sum; return 0; } @@ -1045,9 +952,11 @@ int config_parse_limit( return 0; } - if (!*rl) - if (!(*rl = new(struct rlimit, 1))) - return -ENOMEM; + if (!*rl) { + *rl = new(struct rlimit, 1); + if (!*rl) + return log_oom(); + } (*rl)->rlim_cur = (*rl)->rlim_max = (rlim_t) u; return 0; @@ -1068,31 +977,33 @@ int config_parse_unit_cgroup( size_t l; char *state; + if (isempty(rvalue)) { + /* An empty assignment resets the list */ + cgroup_bonding_free_list(u->cgroup_bondings, false); + u->cgroup_bondings = NULL; + return 0; + } + FOREACH_WORD_QUOTED(w, l, rvalue, state) { - char *t, *k; + char _cleanup_free_ *t = NULL, *k = NULL, *ku = NULL; int r; t = strndup(w, l); if (!t) - return -ENOMEM; + return log_oom(); k = unit_full_printf(u, t); - free(t); - if (!k) - return -ENOMEM; + return log_oom(); - t = cunescape(k); - free(k); - - if (!t) - return -ENOMEM; - - r = unit_add_cgroup_from_text(u, t); - free(t); + ku = cunescape(k); + if (!ku) + return log_oom(); + r = unit_add_cgroup_from_text(u, ku, true, NULL); if (r < 0) { - log_error("[%s:%u] Failed to parse cgroup value, ignoring: %s", filename, line, rvalue); + log_error("[%s:%u] Failed to parse cgroup value %s, ignoring: %s", + filename, line, k, rvalue); return 0; } } @@ -1176,7 +1087,8 @@ int config_parse_kill_signal( assert(rvalue); assert(sig); - if ((r = signal_from_string_try_harder(rvalue)) <= 0) { + r = signal_from_string_try_harder(rvalue); + if (r <= 0) { log_error("[%s:%u] Failed to parse kill signal, ignoring: %s", filename, line, rvalue); return 0; } @@ -1206,15 +1118,22 @@ int config_parse_exec_mount_flags( assert(rvalue); assert(data); - FOREACH_WORD_QUOTED(w, l, rvalue, state) { - if (strncmp(w, "shared", MAX(l, 6U)) == 0) + FOREACH_WORD_SEPARATOR(w, l, rvalue, ", ", state) { + char _cleanup_free_ *t; + + t = strndup(w, l); + if (!t) + return log_oom(); + + if (streq(t, "shared")) flags |= MS_SHARED; - else if (strncmp(w, "slave", MAX(l, 5U)) == 0) + else if (streq(t, "slave")) flags |= MS_SLAVE; - else if (strncmp(w, "private", MAX(l, 7U)) == 0) + else if (streq(w, "private")) flags |= MS_PRIVATE; else { - log_error("[%s:%u] Failed to parse mount flags, ignoring: %s", filename, line, rvalue); + log_error("[%s:%u] Failed to parse mount flag %s, ignoring: %s", + filename, line, t, rvalue); return 0; } } @@ -1234,30 +1153,53 @@ int config_parse_timer( void *userdata) { Timer *t = data; - usec_t u; + usec_t u = 0; TimerValue *v; TimerBase b; + CalendarSpec *c = NULL; + clockid_t id; assert(filename); assert(lvalue); assert(rvalue); assert(data); - if ((b = timer_base_from_string(lvalue)) < 0) { - log_error("[%s:%u] Failed to parse timer base, ignoring: %s", filename, line, lvalue); + if (isempty(rvalue)) { + /* Empty assignment resets list */ + timer_free_values(t); return 0; } - if (parse_usec(rvalue, &u) < 0) { - log_error("[%s:%u] Failed to parse timer value, ignoring: %s", filename, line, rvalue); + b = timer_base_from_string(lvalue); + if (b < 0) { + log_error("[%s:%u] Failed to parse timer base, ignoring: %s", filename, line, lvalue); return 0; } - if (!(v = new0(TimerValue, 1))) - return -ENOMEM; + if (b == TIMER_CALENDAR) { + if (calendar_spec_from_string(rvalue, &c) < 0) { + log_error("[%s:%u] Failed to parse calendar specification, ignoring: %s", filename, line, rvalue); + return 0; + } + + id = CLOCK_REALTIME; + } else { + if (parse_usec(rvalue, &u) < 0) { + log_error("[%s:%u] Failed to parse timer value, ignoring: %s", filename, line, rvalue); + return 0; + } + + id = CLOCK_MONOTONIC; + } + + v = new0(TimerValue, 1); + if (!v) + return log_oom(); v->base = b; + v->clock_id = id; v->value = u; + v->calendar_spec = c; LIST_PREPEND(TimerValue, value, t->values, v); @@ -1278,6 +1220,7 @@ int config_parse_timer_unit( int r; DBusError error; Unit *u; + _cleanup_free_ char *p = NULL; assert(filename); assert(lvalue); @@ -1286,12 +1229,16 @@ int config_parse_timer_unit( dbus_error_init(&error); - if (endswith(rvalue, ".timer")) { + p = unit_name_printf(UNIT(t), rvalue); + if (!p) + return log_oom(); + + if (endswith(p, ".timer")) { log_error("[%s:%u] Unit cannot be of type timer, ignoring: %s", filename, line, rvalue); return 0; } - r = manager_load_unit(UNIT(t)->manager, rvalue, NULL, NULL, &u); + r = manager_load_unit(UNIT(t)->manager, p, NULL, NULL, &u); if (r < 0) { log_error("[%s:%u] Failed to load unit %s, ignoring: %s", filename, line, rvalue, bus_error(&error, r)); dbus_error_free(&error); @@ -1316,32 +1263,42 @@ int config_parse_path_spec( Path *p = data; PathSpec *s; PathType b; + char *k; assert(filename); assert(lvalue); assert(rvalue); assert(data); - if ((b = path_type_from_string(lvalue)) < 0) { - log_error("[%s:%u] Failed to parse path type, ignoring: %s", filename, line, lvalue); + if (isempty(rvalue)) { + /* Empty assignment clears list */ + path_free_specs(p); return 0; } - if (!path_is_absolute(rvalue)) { - log_error("[%s:%u] Path is not absolute, ignoring: %s", filename, line, rvalue); + b = path_type_from_string(lvalue); + if (b < 0) { + log_error("[%s:%u] Failed to parse path type, ignoring: %s", filename, line, lvalue); return 0; } - if (!(s = new0(PathSpec, 1))) - return -ENOMEM; + k = unit_full_printf(UNIT(p), rvalue); + if (!k) + return log_oom(); - if (!(s->path = strdup(rvalue))) { - free(s); - return -ENOMEM; + if (!path_is_absolute(k)) { + log_error("[%s:%u] Path is not absolute, ignoring: %s", filename, line, k); + free(k); + return 0; } - path_kill_slashes(s->path); + s = new0(PathSpec, 1); + if (!s) { + free(k); + return log_oom(); + } + s->path = path_kill_slashes(k); s->type = b; s->inotify_fd = -1; @@ -1364,6 +1321,7 @@ int config_parse_path_unit( int r; DBusError error; Unit *u; + _cleanup_free_ char *p = NULL; assert(filename); assert(lvalue); @@ -1372,13 +1330,18 @@ int config_parse_path_unit( dbus_error_init(&error); - if (endswith(rvalue, ".path")) { - log_error("[%s:%u] Unit cannot be of type path, ignoring: %s", filename, line, rvalue); + p = unit_name_printf(UNIT(t), rvalue); + if (!p) + return log_oom(); + + if (endswith(p, ".path")) { + log_error("[%s:%u] Unit cannot be of type path, ignoring: %s", filename, line, p); return 0; } - if ((r = manager_load_unit(UNIT(t)->manager, rvalue, NULL, &error, &u)) < 0) { - log_error("[%s:%u] Failed to load unit %s, ignoring: %s", filename, line, rvalue, bus_error(&error, r)); + r = manager_load_unit(UNIT(t)->manager, p, NULL, &error, &u); + if (r < 0) { + log_error("[%s:%u] Failed to load unit %s, ignoring: %s", filename, line, p, bus_error(&error, r)); dbus_error_free(&error); return 0; } @@ -1402,6 +1365,7 @@ int config_parse_socket_service( int r; DBusError error; Unit *x; + _cleanup_free_ char *p = NULL; assert(filename); assert(lvalue); @@ -1410,12 +1374,16 @@ int config_parse_socket_service( dbus_error_init(&error); - if (!endswith(rvalue, ".service")) { + p = unit_name_printf(UNIT(s), rvalue); + if (!p) + return log_oom(); + + if (!endswith(p, ".service")) { log_error("[%s:%u] Unit must be of type service, ignoring: %s", filename, line, rvalue); return 0; } - r = manager_load_unit(UNIT(s)->manager, rvalue, NULL, &error, &x); + r = manager_load_unit(UNIT(s)->manager, p, NULL, &error, &x); if (r < 0) { log_error("[%s:%u] Failed to load unit %s, ignoring: %s", filename, line, rvalue, bus_error(&error, r)); dbus_error_free(&error); @@ -1448,38 +1416,66 @@ int config_parse_service_sockets( assert(data); FOREACH_WORD_QUOTED(w, l, rvalue, state) { - char *t, *k; + char _cleanup_free_ *t = NULL, *k = NULL; t = strndup(w, l); if (!t) - return -ENOMEM; + return log_oom(); k = unit_name_printf(UNIT(s), t); - free(t); - if (!k) - return -ENOMEM; + return log_oom(); if (!endswith(k, ".socket")) { - log_error("[%s:%u] Unit must be of type socket, ignoring: %s", filename, line, rvalue); - free(k); + log_error("[%s:%u] Unit must be of type socket, ignoring: %s", + filename, line, k); continue; } r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_WANTS, UNIT_AFTER, k, NULL, true); if (r < 0) - log_error("[%s:%u] Failed to add dependency on %s, ignoring: %s", filename, line, k, strerror(-r)); + log_error("[%s:%u] Failed to add dependency on %s, ignoring: %s", + filename, line, k, strerror(-r)); r = unit_add_dependency_by_name(UNIT(s), UNIT_TRIGGERED_BY, k, NULL, true); if (r < 0) return r; - - free(k); } return 0; } +int config_parse_service_timeout( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + + Service *s = userdata; + int r; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(s); + + r = config_parse_usec(filename, line, section, lvalue, ltype, rvalue, data, userdata); + if (r < 0) + return r; + + if (streq(lvalue, "TimeoutSec")) { + s->start_timeout_defined = true; + s->timeout_stop_usec = s->timeout_start_usec; + } else if (streq(lvalue, "TimeoutStartSec")) + s->start_timeout_defined = true; + + return 0; +} + int config_parse_unit_env_file( const char *filename, unsigned line, @@ -1499,9 +1495,17 @@ int config_parse_unit_env_file( assert(rvalue); assert(data); + if (isempty(rvalue)) { + /* Empty assignment frees the list */ + + strv_free(*env); + *env = NULL; + return 0; + } + s = unit_full_printf(u, rvalue); if (!s) - return -ENOMEM; + return log_oom(); if (!path_is_absolute(s[0] == '-' ? s + 1 : s)) { log_error("[%s:%u] Path '%s' is not absolute, ignoring.", filename, line, s); @@ -1512,7 +1516,7 @@ int config_parse_unit_env_file( k = strv_append(*env, s); free(s); if (!k) - return -ENOMEM; + return log_oom(); strv_free(*env); *env = k; @@ -1537,11 +1541,11 @@ int config_parse_ip_tos( assert(rvalue); assert(data); - if ((x = ip_tos_from_string(rvalue)) < 0) - if (safe_atoi(rvalue, &x) < 0) { - log_error("[%s:%u] Failed to parse IP TOS value, ignoring: %s", filename, line, rvalue); - return 0; - } + x = ip_tos_from_string(rvalue); + if (x < 0) { + log_error("[%s:%u] Failed to parse IP TOS value, ignoring: %s", filename, line, rvalue); + return 0; + } *ip_tos = x; return 0; @@ -1561,12 +1565,20 @@ int config_parse_unit_condition_path( Unit *u = data; bool trigger, negate; Condition *c; + _cleanup_free_ char *p = NULL; assert(filename); assert(lvalue); assert(rvalue); assert(data); + if (isempty(rvalue)) { + /* Empty assignment resets the list */ + condition_free_list(u->conditions); + u->conditions = NULL; + return 0; + } + trigger = rvalue[0] == '|'; if (trigger) rvalue++; @@ -1575,14 +1587,18 @@ int config_parse_unit_condition_path( if (negate) rvalue++; - if (!path_is_absolute(rvalue)) { - log_error("[%s:%u] Path in condition not absolute, ignoring: %s", filename, line, rvalue); + p = unit_full_printf(u, rvalue); + if (!p) + return log_oom(); + + if (!path_is_absolute(p)) { + log_error("[%s:%u] Path in condition not absolute, ignoring: %s", filename, line, p); return 0; } - c = condition_new(cond, rvalue, trigger, negate); + c = condition_new(cond, p, trigger, negate); if (!c) - return -ENOMEM; + return log_oom(); LIST_PREPEND(Condition, conditions, u->conditions, c); return 0; @@ -1602,20 +1618,35 @@ int config_parse_unit_condition_string( Unit *u = data; bool trigger, negate; Condition *c; + _cleanup_free_ char *s = NULL; assert(filename); assert(lvalue); assert(rvalue); assert(data); - if ((trigger = rvalue[0] == '|')) + if (isempty(rvalue)) { + /* Empty assignment resets the list */ + condition_free_list(u->conditions); + u->conditions = NULL; + return 0; + } + + trigger = rvalue[0] == '|'; + if (trigger) rvalue++; - if ((negate = rvalue[0] == '!')) + negate = rvalue[0] == '!'; + if (negate) rvalue++; - if (!(c = condition_new(cond, rvalue, trigger, negate))) - return -ENOMEM; + s = unit_full_printf(u, rvalue); + if (!s) + return log_oom(); + + c = condition_new(cond, s, trigger, negate); + if (!c) + return log_oom(); LIST_PREPEND(Condition, conditions, u->conditions, c); return 0; @@ -1641,13 +1672,23 @@ int config_parse_unit_condition_null( assert(rvalue); assert(data); - if ((trigger = rvalue[0] == '|')) + if (isempty(rvalue)) { + /* Empty assignment resets the list */ + condition_free_list(u->conditions); + u->conditions = NULL; + return 0; + } + + trigger = rvalue[0] == '|'; + if (trigger) rvalue++; - if ((negate = rvalue[0] == '!')) + negate = rvalue[0] == '!'; + if (negate) rvalue++; - if ((b = parse_boolean(rvalue)) < 0) { + b = parse_boolean(rvalue); + if (b < 0) { log_error("[%s:%u] Failed to parse boolean value in condition, ignoring: %s", filename, line, rvalue); return 0; } @@ -1655,8 +1696,9 @@ int config_parse_unit_condition_null( if (!b) negate = !negate; - if (!(c = condition_new(CONDITION_NULL, NULL, trigger, negate))) - return -ENOMEM; + c = condition_new(CONDITION_NULL, NULL, trigger, negate); + if (!c) + return log_oom(); LIST_PREPEND(Condition, conditions, u->conditions, c); return 0; @@ -1676,7 +1718,7 @@ int config_parse_unit_cgroup_attr( void *userdata) { Unit *u = data; - char **l; + _cleanup_strv_free_ char **l = NULL; int r; assert(filename); @@ -1684,19 +1726,23 @@ int config_parse_unit_cgroup_attr( assert(rvalue); assert(data); + if (isempty(rvalue)) { + /* Empty assignment clears the list */ + cgroup_attribute_free_list(u->cgroup_attributes); + u->cgroup_attributes = NULL; + return 0; + } + l = strv_split_quoted(rvalue); if (!l) - return -ENOMEM; + return log_oom(); if (strv_length(l) != 2) { log_error("[%s:%u] Failed to parse cgroup attribute value, ignoring: %s", filename, line, rvalue); - strv_free(l); return 0; } - r = unit_add_cgroup_attribute(u, NULL, l[0], l[1], NULL); - strv_free(l); - + r = unit_add_cgroup_attribute(u, NULL, l[0], l[1], NULL, NULL); if (r < 0) { log_error("[%s:%u] Failed to add cgroup attribute value, ignoring: %s", filename, line, rvalue); return 0; @@ -1709,7 +1755,7 @@ int config_parse_unit_cpu_shares(const char *filename, unsigned line, const char Unit *u = data; int r; unsigned long ul; - char *t; + _cleanup_free_ char *t = NULL; assert(filename); assert(lvalue); @@ -1722,11 +1768,9 @@ int config_parse_unit_cpu_shares(const char *filename, unsigned line, const char } if (asprintf(&t, "%lu", ul) < 0) - return -ENOMEM; - - r = unit_add_cgroup_attribute(u, "cpu", "cpu.shares", t, NULL); - free(t); + return log_oom(); + r = unit_add_cgroup_attribute(u, "cpu", "cpu.shares", t, NULL, NULL); if (r < 0) { log_error("[%s:%u] Failed to add cgroup attribute value, ignoring: %s", filename, line, rvalue); return 0; @@ -1739,7 +1783,7 @@ int config_parse_unit_memory_limit(const char *filename, unsigned line, const ch Unit *u = data; int r; off_t sz; - char *t; + _cleanup_free_ char *t = NULL; assert(filename); assert(lvalue); @@ -1752,14 +1796,12 @@ int config_parse_unit_memory_limit(const char *filename, unsigned line, const ch } if (asprintf(&t, "%llu", (unsigned long long) sz) < 0) - return -ENOMEM; + return log_oom(); r = unit_add_cgroup_attribute(u, "memory", streq(lvalue, "MemorySoftLimit") ? "memory.soft_limit_in_bytes" : "memory.limit_in_bytes", - t, NULL); - free(t); - + t, NULL, NULL); if (r < 0) { log_error("[%s:%u] Failed to add cgroup attribute value, ignoring: %s", filename, line, rvalue); return 0; @@ -1769,7 +1811,7 @@ int config_parse_unit_memory_limit(const char *filename, unsigned line, const ch } static int device_map(const char *controller, const char *name, const char *value, char **ret) { - char **l; + _cleanup_strv_free_ char **l = NULL; assert(controller); assert(name); @@ -1785,43 +1827,34 @@ static int device_map(const char *controller, const char *name, const char *valu if (streq(l[0], "*")) { if (asprintf(ret, "a *:*%s%s", - isempty(l[1]) ? "" : " ", strempty(l[1])) < 0) { - strv_free(l); + isempty(l[1]) ? "" : " ", strempty(l[1])) < 0) return -ENOMEM; - } - } else { struct stat st; if (stat(l[0], &st) < 0) { log_warning("Couldn't stat device %s", l[0]); - strv_free(l); return -errno; } if (!S_ISCHR(st.st_mode) && !S_ISBLK(st.st_mode)) { log_warning("%s is not a device.", l[0]); - strv_free(l); return -ENODEV; } if (asprintf(ret, "%c %u:%u%s%s", S_ISCHR(st.st_mode) ? 'c' : 'b', major(st.st_rdev), minor(st.st_rdev), - isempty(l[1]) ? "" : " ", strempty(l[1])) < 0) { - - strv_free(l); + isempty(l[1]) ? "" : " ", strempty(l[1])) < 0) return -ENOMEM; - } } - strv_free(l); return 0; } int config_parse_unit_device_allow(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata) { Unit *u = data; - char **l; + _cleanup_strv_free_ char **l = NULL; int r; unsigned k; @@ -1832,31 +1865,27 @@ int config_parse_unit_device_allow(const char *filename, unsigned line, const ch l = strv_split_quoted(rvalue); if (!l) - return -ENOMEM; + return log_oom(); k = strv_length(l); if (k < 1 || k > 2) { log_error("[%s:%u] Failed to parse device value, ignoring: %s", filename, line, rvalue); - strv_free(l); return 0; } if (!streq(l[0], "*") && !path_startswith(l[0], "/dev")) { log_error("[%s:%u] Device node path not absolute, ignoring: %s", filename, line, rvalue); - strv_free(l); return 0; } if (!isempty(l[1]) && !in_charset(l[1], "rwm")) { log_error("[%s:%u] Device access string invalid, ignoring: %s", filename, line, rvalue); - strv_free(l); return 0; } - strv_free(l); r = unit_add_cgroup_attribute(u, "devices", streq(lvalue, "DeviceAllow") ? "devices.allow" : "devices.deny", - rvalue, device_map); + rvalue, device_map, NULL); if (r < 0) { log_error("[%s:%u] Failed to add cgroup attribute value, ignoring: %s", filename, line, rvalue); @@ -1868,7 +1897,7 @@ int config_parse_unit_device_allow(const char *filename, unsigned line, const ch static int blkio_map(const char *controller, const char *name, const char *value, char **ret) { struct stat st; - char **l; + _cleanup_strv_free_ char **l = NULL; dev_t d; assert(controller); @@ -1878,13 +1907,12 @@ static int blkio_map(const char *controller, const char *name, const char *value l = strv_split_quoted(value); if (!l) - return -ENOMEM; + return log_oom(); assert(strv_length(l) == 2); if (stat(l[0], &st) < 0) { log_warning("Couldn't stat device %s", l[0]); - strv_free(l); return -errno; } @@ -1900,16 +1928,12 @@ static int blkio_map(const char *controller, const char *name, const char *value block_get_whole_disk(d, &d); } else { log_warning("%s is not a block device and file system block device cannot be determined or is not local.", l[0]); - strv_free(l); return -ENODEV; } - if (asprintf(ret, "%u:%u %s", major(d), minor(d), l[1]) < 0) { - strv_free(l); + if (asprintf(ret, "%u:%u %s", major(d), minor(d), l[1]) < 0) return -ENOMEM; - } - strv_free(l); return 0; } @@ -1919,7 +1943,8 @@ int config_parse_unit_blkio_weight(const char *filename, unsigned line, const ch unsigned long ul; const char *device = NULL, *weight; unsigned k; - char *t, **l; + _cleanup_free_ char *t = NULL; + _cleanup_strv_free_ char **l = NULL; assert(filename); assert(lvalue); @@ -1928,12 +1953,11 @@ int config_parse_unit_blkio_weight(const char *filename, unsigned line, const ch l = strv_split_quoted(rvalue); if (!l) - return -ENOMEM; + return log_oom(); k = strv_length(l); if (k < 1 || k > 2) { log_error("[%s:%u] Failed to parse weight value, ignoring: %s", filename, line, rvalue); - strv_free(l); return 0; } @@ -1946,13 +1970,11 @@ int config_parse_unit_blkio_weight(const char *filename, unsigned line, const ch if (device && !path_is_absolute(device)) { log_error("[%s:%u] Failed to parse block device node value, ignoring: %s", filename, line, rvalue); - strv_free(l); return 0; } if (safe_atolu(weight, &ul) < 0 || ul < 10 || ul > 1000) { log_error("[%s:%u] Failed to parse block IO weight value, ignoring: %s", filename, line, rvalue); - strv_free(l); return 0; } @@ -1960,17 +1982,13 @@ int config_parse_unit_blkio_weight(const char *filename, unsigned line, const ch r = asprintf(&t, "%s %lu", device, ul); else r = asprintf(&t, "%lu", ul); - strv_free(l); - if (r < 0) - return -ENOMEM; + return log_oom(); if (device) - r = unit_add_cgroup_attribute(u, "blkio", "blkio.weight_device", t, blkio_map); + r = unit_add_cgroup_attribute(u, "blkio", "blkio.weight_device", t, blkio_map, NULL); else - r = unit_add_cgroup_attribute(u, "blkio", "blkio.weight", t, NULL); - free(t); - + r = unit_add_cgroup_attribute(u, "blkio", "blkio.weight", t, NULL, NULL); if (r < 0) { log_error("[%s:%u] Failed to add cgroup attribute value, ignoring: %s", filename, line, rvalue); return 0; @@ -1984,7 +2002,8 @@ int config_parse_unit_blkio_bandwidth(const char *filename, unsigned line, const int r; off_t bytes; unsigned k; - char *t, **l; + _cleanup_free_ char *t = NULL; + _cleanup_strv_free_ char **l = NULL; assert(filename); assert(lvalue); @@ -1993,38 +2012,31 @@ int config_parse_unit_blkio_bandwidth(const char *filename, unsigned line, const l = strv_split_quoted(rvalue); if (!l) - return -ENOMEM; + return log_oom(); k = strv_length(l); if (k != 2) { log_error("[%s:%u] Failed to parse bandwidth value, ignoring: %s", filename, line, rvalue); - strv_free(l); return 0; } if (!path_is_absolute(l[0])) { log_error("[%s:%u] Failed to parse block device node value, ignoring: %s", filename, line, rvalue); - strv_free(l); return 0; } if (parse_bytes(l[1], &bytes) < 0 || bytes <= 0) { - log_error("[%s:%u] Failed to parse block IO bandwith value, ignoring: %s", filename, line, rvalue); - strv_free(l); + log_error("[%s:%u] Failed to parse block IO bandwidth value, ignoring: %s", filename, line, rvalue); return 0; } r = asprintf(&t, "%s %llu", l[0], (unsigned long long) bytes); - strv_free(l); - if (r < 0) - return -ENOMEM; + return log_oom(); r = unit_add_cgroup_attribute(u, "blkio", streq(lvalue, "BlockIOReadBandwidth") ? "blkio.read_bps_device" : "blkio.write_bps_device", - t, blkio_map); - free(t); - + t, blkio_map, NULL); if (r < 0) { log_error("[%s:%u] Failed to add cgroup attribute value, ignoring: %s", filename, line, rvalue); return 0; @@ -2082,6 +2094,13 @@ int config_parse_documentation( assert(rvalue); assert(u); + if (isempty(rvalue)) { + /* Empty assignment resets the list */ + strv_free(u->documentation); + u->documentation = NULL; + return 0; + } + r = config_parse_unit_strv_printf(filename, line, section, lvalue, ltype, rvalue, data, userdata); if (r < 0) return r; @@ -2100,6 +2119,96 @@ int config_parse_documentation( return r; } +static void syscall_set(uint32_t *p, int nr) { + nr = SYSCALL_TO_INDEX(nr); + p[nr >> 4] |= 1 << (nr & 31); +} + +static void syscall_unset(uint32_t *p, int nr) { + nr = SYSCALL_TO_INDEX(nr); + p[nr >> 4] &= ~(1 << (nr & 31)); +} + +int config_parse_syscall_filter( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + + ExecContext *c = data; + Unit *u = userdata; + bool invert = false; + char *w; + size_t l; + char *state; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(u); + + if (isempty(rvalue)) { + /* Empty assignment resets the list */ + free(c->syscall_filter); + c->syscall_filter = NULL; + return 0; + } + + if (rvalue[0] == '~') { + invert = true; + rvalue++; + } + + if (!c->syscall_filter) { + size_t n; + + n = (syscall_max() + 31) >> 4; + c->syscall_filter = new(uint32_t, n); + if (!c->syscall_filter) + return log_oom(); + + memset(c->syscall_filter, invert ? 0xFF : 0, n * sizeof(uint32_t)); + + /* Add these by default */ + syscall_set(c->syscall_filter, __NR_execve); + syscall_set(c->syscall_filter, __NR_rt_sigreturn); +#ifdef __NR_sigreturn + syscall_set(c->syscall_filter, __NR_sigreturn); +#endif + syscall_set(c->syscall_filter, __NR_exit_group); + syscall_set(c->syscall_filter, __NR_exit); + } + + FOREACH_WORD_QUOTED(w, l, rvalue, state) { + int id; + char _cleanup_free_ *t = NULL; + + t = strndup(w, l); + if (!t) + return log_oom(); + + id = syscall_from_name(t); + if (id < 0) { + log_error("[%s:%u] Failed to parse syscall, ignoring: %s", + filename, line, t); + continue; + } + + if (invert) + syscall_unset(c->syscall_filter, id); + else + syscall_set(c->syscall_filter, id); + } + + c->no_new_privileges = true; + + return 0; +} + #define FOLLOW_MAX 8 static int open_follow(char **filename, FILE **_f, Set *names, char **_final) { @@ -2146,21 +2255,24 @@ static int open_follow(char **filename, FILE **_f, Set *names, char **_final) { } /* Try to open the file name, but don't if its a symlink */ - if ((fd = open(*filename, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW)) >= 0) + fd = open(*filename, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW); + if (fd >= 0) break; if (errno != ELOOP) return -errno; /* Hmm, so this is a symlink. Let's read the name, and follow it manually */ - if ((r = readlink_and_make_absolute(*filename, &target)) < 0) + r = readlink_and_make_absolute(*filename, &target); + if (r < 0) return r; free(*filename); *filename = target; } - if (!(f = fdopen(fd, "re"))) { + f = fdopen(fd, "re"); + if (!f) { r = -errno; close_nointr_nofail(fd); return r; @@ -2184,7 +2296,8 @@ static int merge_by_names(Unit **u, Set *names, const char *id) { /* First try to merge in the other name into our * unit */ - if ((r = unit_merge_by_name(*u, k)) < 0) { + r = unit_merge_by_name(*u, k); + if (r < 0) { Unit *other; /* Hmm, we couldn't merge the other unit into @@ -2194,11 +2307,13 @@ static int merge_by_names(Unit **u, Set *names, const char *id) { other = manager_get_unit((*u)->manager, k); free(k); - if (other) - if ((r = unit_merge(other, *u)) >= 0) { + if (other) { + r = unit_merge(other, *u); + if (r >= 0) { *u = other; return merge_by_names(u, names, NULL); } + } return r; } @@ -2229,12 +2344,14 @@ static int load_from_path(Unit *u, const char *path) { if (path_is_absolute(path)) { - if (!(filename = strdup(path))) { + filename = strdup(path); + if (!filename) { r = -ENOMEM; goto finish; } - if ((r = open_follow(&filename, &f, symlink_names, &id)) < 0) { + r = open_follow(&filename, &f, symlink_names, &id); + if (r < 0) { free(filename); filename = NULL; @@ -2250,7 +2367,8 @@ static int load_from_path(Unit *u, const char *path) { /* Instead of opening the path right away, we manually * follow all symlinks and add their name to our unit * name set while doing so */ - if (!(filename = path_make_absolute(path, *p))) { + filename = path_make_absolute(path, *p); + if (!filename) { r = -ENOMEM; goto finish; } @@ -2262,8 +2380,6 @@ static int load_from_path(Unit *u, const char *path) { r = open_follow(&filename, &f, symlink_names, &id); if (r < 0) { - char *sn; - free(filename); filename = NULL; @@ -2271,9 +2387,7 @@ static int load_from_path(Unit *u, const char *path) { goto finish; /* Empty the symlink names for the next run */ - while ((sn = set_steal_first(symlink_names))) - free(sn); - + set_clear_free(symlink_names); continue; } @@ -2288,7 +2402,8 @@ static int load_from_path(Unit *u, const char *path) { } merged = u; - if ((r = merge_by_names(&merged, symlink_names, id)) < 0) + r = merge_by_names(&merged, symlink_names, id); + if (r < 0) goto finish; if (merged != u) { @@ -2297,7 +2412,6 @@ static int load_from_path(Unit *u, const char *path) { goto finish; } - zero(st); if (fstat(fileno(f), &st) < 0) { r = -errno; goto finish; @@ -2320,6 +2434,13 @@ static int load_from_path(Unit *u, const char *path) { u->fragment_mtime = timespec_load(&st.st_mtim); + if (u->source_path) { + if (stat(u->source_path, &st) >= 0) + u->source_mtime = timespec_load(&st.st_mtim); + else + u->source_mtime = 0; + } + r = 0; finish: @@ -2344,7 +2465,8 @@ int unit_load_fragment(Unit *u) { /* First, try to find the unit under its id. We always look * for unit files in the default directories, to make it easy * to override things by placing things in /etc/systemd/system */ - if ((r = load_from_path(u, u->id)) < 0) + r = load_from_path(u, u->id); + if (r < 0) return r; /* Try to find an alias we can load this with */ @@ -2354,7 +2476,8 @@ int unit_load_fragment(Unit *u) { if (t == u->id) continue; - if ((r = load_from_path(u, t)) < 0) + r = load_from_path(u, t); + if (r < 0) return r; if (u->load_state != UNIT_STUB) @@ -2364,7 +2487,8 @@ int unit_load_fragment(Unit *u) { /* And now, try looking for it under the suggested (originally linked) path */ if (u->load_state == UNIT_STUB && u->fragment_path) { - if ((r = load_from_path(u, u->fragment_path)) < 0) + r = load_from_path(u, u->fragment_path); + if (r < 0) return r; if (u->load_state == UNIT_STUB) { @@ -2380,7 +2504,8 @@ int unit_load_fragment(Unit *u) { if (u->load_state == UNIT_STUB && u->instance) { char *k; - if (!(k = unit_name_template(u->id))) + k = unit_name_template(u->id); + if (!k) return -ENOMEM; r = load_from_path(u, k); @@ -2395,7 +2520,8 @@ int unit_load_fragment(Unit *u) { if (t == u->id) continue; - if (!(k = unit_name_template(t))) + k = unit_name_template(t); + if (!k) return -ENOMEM; r = load_from_path(u, k); @@ -2440,12 +2566,10 @@ void unit_dump_config_items(FILE *f) { { config_parse_level, "LEVEL" }, { config_parse_exec_capabilities, "CAPABILITIES" }, { config_parse_exec_secure_bits, "SECUREBITS" }, - { config_parse_exec_bounding_set, "BOUNDINGSET" }, - { config_parse_exec_timer_slack_nsec, "TIMERSLACK" }, + { config_parse_bounding_set, "BOUNDINGSET" }, { config_parse_limit, "LIMIT" }, { config_parse_unit_cgroup, "CGROUP [...]" }, { config_parse_unit_deps, "UNIT [...]" }, - { config_parse_unit_names, "UNIT [...]" }, { config_parse_exec, "PATH [ARGUMENT [...]]" }, { config_parse_service_type, "SERVICETYPE" }, { config_parse_service_restart, "SERVICERESTART" }, @@ -2460,6 +2584,7 @@ void unit_dump_config_items(FILE *f) { { config_parse_socket_bind, "SOCKETBIND" }, { config_parse_socket_bindtodevice, "NETWORKINTERFACE" }, { config_parse_usec, "SECONDS" }, + { config_parse_nsec, "NANOSECONDS" }, { config_parse_path_strv, "PATH [...]" }, { config_parse_unit_requires_mounts_for, "PATH [...]" }, { config_parse_exec_mount_flags, "MOUNTFLAG [...]" },