diff options
| author | Daniel Mack <daniel@zonque.org> | 2014-11-05 14:32:48 +0100 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2014-11-05 14:48:20 +0100 |
| commit | d704fda9347f3019fd2a14881bcb6df640c36a80 (patch) | |
| tree | f385ba75e6dc67b10fc31273e17fb50f3318ba47 /src/libsystemd/sd-bus/bus-kernel.c | |
| parent | cfe2061add5479710f6597899d632e64c54e62ef (diff) | |
sd-bus: sync up with new kdbus metadata attachment logic (ABI break)
The metadata logic in kdbus has seen a rework, and the only mandatory
change we have to follow for now is that attach_flags in kdbus_cmd_hello
is now split into two parts, attach_flags_send and attach_flags_recv.
Diffstat (limited to 'src/libsystemd/sd-bus/bus-kernel.c')
| -rw-r--r-- | src/libsystemd/sd-bus/bus-kernel.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index 11039b8e13..142eb91c64 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -721,7 +721,8 @@ int bus_kernel_take_fd(sd_bus *b) { hello = alloca0_align(sz, 8); hello->size = sz; hello->flags = b->hello_flags; - hello->attach_flags = b->attach_flags; + hello->attach_flags_send = _KDBUS_ATTACH_ALL; + hello->attach_flags_recv = b->attach_flags; hello->pool_size = KDBUS_POOL_SIZE; item = hello->items; @@ -1556,7 +1557,8 @@ int bus_kernel_make_starter( (activating ? KDBUS_HELLO_ACTIVATOR : KDBUS_HELLO_POLICY_HOLDER) | (accept_fd ? KDBUS_HELLO_ACCEPT_FD : 0); hello->pool_size = KDBUS_POOL_SIZE; - hello->attach_flags = _KDBUS_ATTACH_ALL; + hello->attach_flags_send = _KDBUS_ATTACH_ALL; + hello->attach_flags_recv = _KDBUS_ATTACH_ALL; if (ioctl(fd, KDBUS_CMD_HELLO, hello) < 0) return -errno; |