From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 29 Nov 2017 10:33:26 +0000 (+0100)
Subject: bus-unit-util: properly serialize EnvironmentFile= empty assignment
X-Git-Tag: v236~94^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5716965132bfad3c897b11799e478820a9587a45;p=thirdparty%2Fsystemd.git

bus-unit-util: properly serialize EnvironmentFile= empty assignment

In that case we need to generate an empty array.
---

diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
index 5e88866dc7c..0cc3f991b3c 100644
--- a/src/shared/bus-unit-util.c
+++ b/src/shared/bus-unit-util.c
@@ -134,9 +134,12 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
 
         } else if (streq(field, "EnvironmentFile")) {
 
-                r = sd_bus_message_append(m, "sv", "EnvironmentFiles", "a(sb)", 1,
-                                          eq[0] == '-' ? eq + 1 : eq,
-                                          eq[0] == '-');
+                if (isempty(eq))
+                        r = sd_bus_message_append(m, "sv", "EnvironmentFiles", "a(sb)", 0);
+                else
+                        r = sd_bus_message_append(m, "sv", "EnvironmentFiles", "a(sb)", 1,
+                                                  eq[0] == '-' ? eq + 1 : eq,
+                                                  eq[0] == '-');
                 goto finish;
 
         } else if (STR_IN_SET(field, "AccuracySec", "RandomizedDelaySec", "RuntimeMaxSec")) {