diff options
| author | Daniel Mack <zonque@gmail.com> | 2013-12-18 00:20:55 +0100 |
|---|---|---|
| committer | Daniel Mack <zonque@gmail.com> | 2013-12-18 00:20:55 +0100 |
| commit | ceceaf09f9e4a53f86c623d70931676255aef334 (patch) | |
| tree | 9305d511948eac200fbd5fc9c1b366528677ad28 /src/libsystemd-bus/bus-kernel.c | |
| parent | d638dee035bea5ce1082cce6448ad4d8f8cedf55 (diff) | |
bus: sync with kdbus
Two new things here:
a) struct kdbus_notify_name_change now carries two struct
kdbus_notify_id_change
b) a new KDBUS_CMD_BYEBYE ioctl that has no user yet in systemd
Diffstat (limited to 'src/libsystemd-bus/bus-kernel.c')
| -rw-r--r-- | src/libsystemd-bus/bus-kernel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c index 5be91d4646..bd6b84a7ba 100644 --- a/src/libsystemd-bus/bus-kernel.c +++ b/src/libsystemd-bus/bus-kernel.c @@ -515,19 +515,19 @@ static int translate_name_change(sd_bus *bus, struct kdbus_msg *k, struct kdbus_ assert(k); assert(d); - if (d->type == KDBUS_ITEM_NAME_ADD || (d->name_change.old_flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_ACTIVATOR))) + if (d->type == KDBUS_ITEM_NAME_ADD || (d->name_change.old.flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_ACTIVATOR))) old_owner[0] = 0; else - sprintf(old_owner, ":1.%llu", (unsigned long long) d->name_change.old_id); + sprintf(old_owner, ":1.%llu", (unsigned long long) d->name_change.old.id); - if (d->type == KDBUS_ITEM_NAME_REMOVE || (d->name_change.new_flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_ACTIVATOR))) { + if (d->type == KDBUS_ITEM_NAME_REMOVE || (d->name_change.new.flags & (KDBUS_NAME_IN_QUEUE|KDBUS_NAME_ACTIVATOR))) { if (isempty(old_owner)) return 0; new_owner[0] = 0; } else - sprintf(new_owner, ":1.%llu", (unsigned long long) d->name_change.new_id); + sprintf(new_owner, ":1.%llu", (unsigned long long) d->name_change.new.id); return push_name_owner_changed(bus, d->name_change.name, old_owner, new_owner); } |