diff options
author | Lennart Poettering <lennart@poettering.net> | 2014-11-28 02:23:29 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2014-11-28 02:25:45 +0100 |
commit | 412c18f10c9df3f0a02358d8c0e707ed2e5fa186 (patch) | |
tree | 0e7c1a1528245db9eeafc0f1e1affa6afa980715 /src/libsystemd | |
parent | 8f16f51d9323e87cc78d28e9656984c028071f94 (diff) |
sd-bus: the attach_mask kernel module parameter is 64bit now, hence initialize it as such
Diffstat (limited to 'src/libsystemd')
-rw-r--r-- | src/libsystemd/sd-bus/bus-kernel.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index 759d566eb3..a7d18e337b 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -1800,10 +1800,15 @@ int bus_kernel_realize_attach_flags(sd_bus *bus) { int bus_kernel_fix_attach_mask(void) { _cleanup_free_ char *mask = NULL; - uint64_t m = (uint32_t) -1; + uint64_t m = (uint64_t) -1; char buf[2+16+2]; int r; + /* By default we don't want any kdbus metadata fields to be + * suppressed, hence we reset the kernel mask for it to + * (uint64_t) -1. This is overridable via a kernel command + * line option, however. */ + r = get_proc_cmdline_key("systemd.kdbus_attach_flags_mask=", &mask); if (r < 0) { log_warning_errno(-r, "Failed to read kernel command line: %m"); |