From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 18 Apr 2018 17:50:07 +0000 (+0200)
Subject: core: fix resetting of Delegate= and properly ignore invalid assignment
X-Git-Tag: v239~388^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff1b8455c26b560641d476b426209e297209333a;p=thirdparty%2Fsystemd.git

core: fix resetting of Delegate= and properly ignore invalid assignment

The default is false not true. If we say "ignoring" we must return 0.
---

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 767355adf6d..403c0afd579 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -3411,7 +3411,7 @@ int config_parse_delegate(
          * mask to delegate. */
 
         if (isempty(rvalue)) {
-                c->delegate = true;
+                c->delegate = false;
                 c->delegate_controllers = 0;
                 return 0;
         }
@@ -3432,7 +3432,7 @@ int config_parse_delegate(
                                 return log_oom();
                         if (r < 0) {
                                 log_syntax(unit, LOG_ERR, filename, line, r, "Invalid syntax, ignoring: %s", rvalue);
-                                return r;
+                                return 0;
                         }
 
                         cc = cgroup_controller_from_string(word);