summaryrefslogtreecommitdiff
path: root/src/nspawn/nspawn-settings.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/nspawn/nspawn-settings.c')
-rw-r--r--src/nspawn/nspawn-settings.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c
index 62a3486952..505e8cac40 100644
--- a/src/nspawn/nspawn-settings.c
+++ b/src/nspawn/nspawn-settings.c
@@ -177,7 +177,6 @@ int config_parse_capability(
for (;;) {
_cleanup_free_ char *word = NULL;
- int cap;
r = extract_first_word(&rvalue, &word, NULL, 0);
if (r < 0) {
@@ -187,13 +186,13 @@ int config_parse_capability(
if (r == 0)
break;
- cap = capability_from_name(word);
- if (cap < 0) {
- log_syntax(unit, LOG_ERR, filename, line, 0, "Failed to parse capability, ignoring: %s", word);
+ r = capability_from_name(word);
+ if (r < 0) {
+ log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse capability, ignoring: %s", word);
continue;
}
- u |= UINT64_C(1) << cap;
+ u |= UINT64_C(1) << r;
}
if (u == 0)
@@ -391,7 +390,7 @@ int config_parse_network_zone(
j = strappend("vz-", rvalue);
if (!ifname_valid(j)) {
- log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid network zone name %s, ignoring: %m", rvalue);
+ log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid network zone name, ignoring: %s", rvalue);
return 0;
}