diff options
| author | Kay Sievers <kay@vrfy.org> | 2013-11-28 02:26:03 +0100 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2013-11-28 02:26:03 +0100 |
| commit | dd971bd2cef3e77cba28e52d7d51ec37035e3e61 (patch) | |
| tree | 18fe233170993cfc3ad5167af37d0c9a36e31dc9 | |
| parent | 5acac4c814f973d1d47e5fbad1fa52cd3e92e7cf (diff) | |
bus: update kdbus.h and always subscribe to KDBUS_HELLO_ATTACH_NAMES
| -rw-r--r-- | src/libsystemd-bus/kdbus.h | 15 | ||||
| -rw-r--r-- | src/libsystemd-bus/sd-bus.c | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/libsystemd-bus/kdbus.h b/src/libsystemd-bus/kdbus.h index 9b4163802..3d21689bb 100644 --- a/src/libsystemd-bus/kdbus.h +++ b/src/libsystemd-bus/kdbus.h @@ -240,13 +240,14 @@ enum { /* subscription for metadata to attach */ KDBUS_HELLO_ATTACH_TIMESTAMP = 1 << 8, KDBUS_HELLO_ATTACH_CREDS = 1 << 9, - KDBUS_HELLO_ATTACH_COMM = 1 << 10, - KDBUS_HELLO_ATTACH_EXE = 1 << 11, - KDBUS_HELLO_ATTACH_CMDLINE = 1 << 12, - KDBUS_HELLO_ATTACH_CGROUP = 1 << 13, - KDBUS_HELLO_ATTACH_CAPS = 1 << 14, - KDBUS_HELLO_ATTACH_SECLABEL = 1 << 15, - KDBUS_HELLO_ATTACH_AUDIT = 1 << 16, + KDBUS_HELLO_ATTACH_NAMES = 1 << 10, + KDBUS_HELLO_ATTACH_COMM = 1 << 11, + KDBUS_HELLO_ATTACH_EXE = 1 << 12, + KDBUS_HELLO_ATTACH_CMDLINE = 1 << 13, + KDBUS_HELLO_ATTACH_CGROUP = 1 << 14, + KDBUS_HELLO_ATTACH_CAPS = 1 << 15, + KDBUS_HELLO_ATTACH_SECLABEL = 1 << 16, + KDBUS_HELLO_ATTACH_AUDIT = 1 << 17, }; struct kdbus_cmd_hello { diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c index f13e346dc..49a2abc73 100644 --- a/src/libsystemd-bus/sd-bus.c +++ b/src/libsystemd-bus/sd-bus.c @@ -181,7 +181,7 @@ _public_ int sd_bus_new(sd_bus **ret) { r->n_ref = REFCNT_INIT; r->input_fd = r->output_fd = -1; r->message_version = 1; - r->hello_flags |= KDBUS_HELLO_ACCEPT_FD; + r->hello_flags |= KDBUS_HELLO_ACCEPT_FD|KDBUS_HELLO_ATTACH_NAMES; r->original_pid = getpid(); assert_se(pthread_mutex_init(&r->memfd_cache_mutex, NULL) == 0); |