From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 21 Nov 2013 19:18:59 +0000 (+0100)
Subject: bus: properly serialize unit file change list
X-Git-Tag: v209~1352
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=21586b77de9bad401f245dd55b75cedb0c2e9b7c

bus: properly serialize unit file change list
---

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index d7936fff2..bc0c3109e 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -1367,7 +1367,7 @@ static int reply_unit_file_changes_and_free(
 
         for (i = 0; i < n_changes; i++) {
                 r = sd_bus_message_append(
-                                message, "(sss)",
+                                reply, "(sss)",
                                 unit_file_change_type_to_string(changes[i].type),
                                 changes[i].path,
                                 changes[i].source);
@@ -1379,7 +1379,7 @@ static int reply_unit_file_changes_and_free(
         if (r < 0)
                 goto fail;
 
-        return sd_bus_send(bus, message, NULL);
+        return sd_bus_send(bus, reply, NULL);
 
 fail:
         unit_file_changes_free(changes, n_changes);
diff --git a/src/libsystemd-bus/bus-util.c b/src/libsystemd-bus/bus-util.c
index 4d73df585..2140dbc67 100644
--- a/src/libsystemd-bus/bus-util.c
+++ b/src/libsystemd-bus/bus-util.c
@@ -1100,7 +1100,6 @@ int bus_maybe_reply_error(sd_bus_message *m, int r, sd_bus_error *error) {
         } else if (sd_bus_error_is_set(error)) {
                 if (m->header->type == SD_BUS_MESSAGE_METHOD_CALL)
                         sd_bus_reply_method_error(m, error);
-
         } else
                 return r;