diff options
| author |   Lennart Poettering <lennart@poettering.net> | 2013-11-21 20:18:59 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-11-21 21:12:36 +0100 |
| commit | 21586b77de9bad401f245dd55b75cedb0c2e9b7c (patch) | |
| tree | 14bca8c67e7cd74ae687369b39465995a36a2f3a /src | |
| parent | logind,machined,run: properly invoke StartTransientUnit() bus call (diff) | |
| download | systemd-21586b77de9bad401f245dd55b75cedb0c2e9b7c.tar.gz systemd-21586b77de9bad401f245dd55b75cedb0c2e9b7c.tar.bz2 systemd-21586b77de9bad401f245dd55b75cedb0c2e9b7c.zip | |
bus: properly serialize unit file change list
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/dbus-manager.c | 4 | ||||
| -rw-r--r-- | src/libsystemd-bus/bus-util.c | 1 |
2 files changed, 2 insertions, 3 deletions
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; |