summaryrefslogtreecommitdiff
path: root/src/bus-proxyd
diff options
context:
space:
mode:
authorDaniel Mack <daniel@zonque.org>2014-11-04 12:08:36 +0100
committerDaniel Mack <daniel@zonque.org>2014-11-04 12:44:53 +0100
commit635f9f0d95d1cc460f2c59a8fe26ecc358420544 (patch)
tree4f3c144e16fed80a51f29746cff4d6257bd15818 /src/bus-proxyd
parentdfb05a1cf5479e6949d2413a633431c64d006ff2 (diff)
sd-bus: sync kdbus.h (ABI break)
Catch up with some changes in kdbus.h: * KDBUS_{ITEM,ATTACH}_CONN_NAME were renamed to KDBUS_{ITEM,ATTACH}_CONN_DESCRIPTION, so the term 'name' is not overloaded as much. * The item types were re-ordered a little so they are lined up to the order of the corresponding KDBUS_ATTACH flags * A new item type KDBUS_ITEM_OWNED_NAME was introduced, designated to store a struct kdbus_name in item->name. KDBUS_ITEM_NAME soley stores data in item->str now * Some kerneldoc fixes
Diffstat (limited to 'src/bus-proxyd')
-rw-r--r--src/bus-proxyd/bus-proxyd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index 8c1b6a5ad6..8cab1023dd 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -768,8 +768,8 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) {
char *n;
KDBUS_ITEM_FOREACH(item, name, items)
- if (item->type == KDBUS_ITEM_NAME)
- entry_name = item->str;
+ if (item->type == KDBUS_ITEM_OWNED_NAME)
+ entry_name = item->name.name;
if (!streq_ptr(entry_name, arg0))
continue;