diff options
| author | Lukasz Skalski <l.skalski@samsung.com> | 2014-10-10 16:42:19 +0200 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2014-10-10 23:43:59 +0200 |
| commit | 547e849b722e597d70ba069e2cb8931317d66e00 (patch) | |
| tree | cbfb6908a8457b2d24d1dee3f46bc08913c0f71f | |
| parent | 0fff82e5f867f9494ed631736964d9abfe672673 (diff) | |
bus-proxyd: fix compatibility with old dbus-1
'ListQueuedOwners' method should return 'NameHasNoOwner' error
if chosen name is not available on bus.
| -rw-r--r-- | src/bus-proxyd/bus-proxyd.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c index 4f44825679..52498f33d2 100644 --- a/src/bus-proxyd/bus-proxyd.c +++ b/src/bus-proxyd/bus-proxyd.c @@ -733,6 +733,7 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) { struct kdbus_cmd_free cmd_free; struct kdbus_cmd_name *name; _cleanup_strv_free_ char **owners = NULL; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; char *arg0; int err = 0; @@ -743,6 +744,14 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) { if (!service_name_is_valid(arg0)) return synthetic_reply_method_errno(m, -EINVAL, NULL); + r = sd_bus_get_owner(a, arg0, 0, NULL); + if (r == -ESRCH || r == -ENXIO) { + sd_bus_error_setf(&error, SD_BUS_ERROR_NAME_HAS_NO_OWNER, "Could not get owners of name '%s': no such name.", arg0); + return synthetic_reply_method_errno(m, r, &error); + } + if (r < 0) + return synthetic_reply_method_errno(m, r, NULL); + cmd.flags = KDBUS_NAME_LIST_QUEUED; r = ioctl(a->input_fd, KDBUS_CMD_NAME_LIST, &cmd); if (r < 0) |