From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 6 Feb 2019 16:41:26 +0000 (+0100)
Subject: core/load-fragment: empty assignment to PIDFile= resets the value
X-Git-Tag: v241~25^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8055c05e256ccd35ce115864725bfee73b22731;p=thirdparty%2Fsystemd.git

core/load-fragment: empty assignment to PIDFile= resets the value

Follow-up for a9353a5c5b512f107955e56a9812724f40b841d3.
---

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 159e8d50508..44f00a30460 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -4254,6 +4254,12 @@ int config_parse_pid_file(
         assert(rvalue);
         assert(u);
 
+        if (isempty(rvalue)) {
+                /* An empty assignment removes already set value. */
+                *s = mfree(*s);
+                return 0;
+        }
+
         r = unit_full_printf(u, rvalue, &k);
         if (r < 0) {
                 log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in '%s', ignoring: %m", rvalue);