diff options
author | Daniel Mack <daniel@zonque.org> | 2014-10-06 18:36:16 +0200 |
---|---|---|
committer | Daniel Mack <daniel@zonque.org> | 2014-10-06 18:36:16 +0200 |
commit | d663f1b1a92a778bcdc68f29b8c08cb49431b4f7 (patch) | |
tree | 803f4d94844aecb45175f519492fc452228b8ec9 /src/bus-proxyd/bus-proxyd.c | |
parent | 27c64db6dff88ebe9761dfe3b0c073d2a9bf2e41 (diff) |
sd-bus: sync kdbus.h (ABI break)
The KDBUS_CMD_FREE ioctl now uses a struct rather than a direct pointer
to the offset to free.
The KDBUS_CMD_MSG_CANCEL ioctl has also changes, but there's no user of
it yet in systemd.
Diffstat (limited to 'src/bus-proxyd/bus-proxyd.c')
-rw-r--r-- | src/bus-proxyd/bus-proxyd.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c index 5d58cd2af4..cbec04933c 100644 --- a/src/bus-proxyd/bus-proxyd.c +++ b/src/bus-proxyd/bus-proxyd.c @@ -730,6 +730,7 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) { } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "ListQueuedOwners")) { struct kdbus_cmd_name_list cmd = {}; struct kdbus_name_list *name_list; + struct kdbus_cmd_free cmd_free; struct kdbus_cmd_name *name; _cleanup_strv_free_ char **owners = NULL; char *arg0; @@ -773,7 +774,10 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) { } } - r = ioctl(a->input_fd, KDBUS_CMD_FREE, &cmd.offset); + cmd_free.flags = 0; + cmd_free.offset = cmd.offset; + + r = ioctl(a->input_fd, KDBUS_CMD_FREE, &cmd_free); if (r < 0) return synthetic_reply_method_errno(m, r, NULL); |