fixes to the dbus code to make GetAll() in the properties iface work

diff --git a/dbus-unit.c b/dbus-unit.c
index 5988f96102ea71b1aaeb6ea19149bdf42a2342aa..d47408265cb07e975b7abddafa1f23d075422bad 100644 (file)
--- a/dbus-unit.c
+++ b/dbus-unit.c
@@ -30,7 +30,7 @@ static int bus_unit_append_id(Manager *m, DBusMessageIter *i, const char *proper
 
         id = unit_id(u);
 
-        if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &u))
+        if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &id))
                 return -ENOMEM;
 
         return 0;

diff --git a/dbus.c b/dbus.c
index 17987210e6b2067d683959825dda8a5b31da03ec..84b8fbf09408377823b31c4181da3a60ba46d601 100644 (file)
--- a/dbus.c
+++ b/dbus.c
@@ -436,7 +436,7 @@ DBusHandlerResult bus_default_message_handler(Manager *m, DBusMessage *message,
                         if (!streq(p->interface, interface))
                                 continue;
 
-                        if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, "sv" , &sub2) ||
+                        if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, NULL, &sub2) ||
                             !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &p->property) ||
                             !dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, p->signature, &sub3))
                                 goto oom;