From: David Herrmann <dh.herrmann@gmail.com>
Date: Mon, 2 Dec 2013 22:26:55 +0000 (+0100)
Subject: core: fix Unit.SetProperties argument parsing
X-Git-Tag: v209~1037
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=559a4d4cda0155708e5f0797afeb8e80a4e26e43;hp=f820cf99c1cdb58e270fdf92389fea0413c1484e

core: fix Unit.SetProperties argument parsing

SetProperties has signature "ba(sv)", but the bus_unit_set_properties()
helper already does a enter_container('a', "sv") so we have to skip it in
bus_unit_method_set_properties().
---

diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index 1fec0e3b1..e95a52927 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -480,18 +480,10 @@ int bus_unit_method_set_properties(sd_bus *bus, sd_bus_message *message, void *u
         if (r < 0)
                 return r;
 
-        r = sd_bus_message_enter_container(message, 'a', "(sv)");
-        if (r < 0)
-                return r;
-
         r = bus_unit_set_properties(u, message, runtime ? UNIT_RUNTIME : UNIT_PERSISTENT, true, error);
         if (r < 0)
                 return r;
 
-        r = sd_bus_message_exit_container(message);
-        if (r < 0)
-                return r;
-
         return sd_bus_reply_method_return(message, NULL);
 }