summaryrefslogtreecommitdiff
path: root/src/bus-proxyd/bus-proxyd.c
diff options
context:
space:
mode:
authorDaniel Mack <daniel@zonque.org>2014-09-22 18:20:14 +0200
committerDaniel Mack <daniel@zonque.org>2014-09-22 18:22:53 +0200
commitf8c2425287c8362ae3a3c9acfb9e23a16862b38a (patch)
treebc2b8580f79fc0aacf3d02881af9c913f9be07d7 /src/bus-proxyd/bus-proxyd.c
parent8507eb20b64010b26f23822cbf442bb0bf96511c (diff)
sd-bus: sync kdbus.h (API+ABI break)
The kdbus logic name registry logic was changed to transport the actual name to acquire, release or report in a kdbus item. This brings the name API a little more in line with other calls, and allows for later augmentation. Follow that change on the systemd side.
Diffstat (limited to 'src/bus-proxyd/bus-proxyd.c')
-rw-r--r--src/bus-proxyd/bus-proxyd.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index d35d7f63b2..a5387bb234 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -743,12 +743,15 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) {
name_list = (struct kdbus_name_list *) ((uint8_t *) a->kdbus_buffer + cmd.offset);
KDBUS_ITEM_FOREACH(name, name_list, names) {
+ const char *entry_name = NULL;
+ struct kdbus_item *item;
char *n;
- if (name->size <= sizeof(*name))
- continue;
+ KDBUS_ITEM_FOREACH(item, name, items)
+ if (item->type == KDBUS_ITEM_NAME)
+ entry_name = item->str;
- if (!streq(name->name, arg0))
+ if (!streq_ptr(entry_name, arg0))
continue;
if (asprintf(&n, ":1.%llu", (unsigned long long) name->owner_id) < 0) {