chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: the attach_mask kernel module parameter is 64bit now, hence initialize it...
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-kernel.c
diff --git
a/src/libsystemd/sd-bus/bus-kernel.c
b/src/libsystemd/sd-bus/bus-kernel.c
index 759d566eb31d9fc4d3c8a7fb33bcc3802a9c9310..a7d18e337b874244b97cccfc9348ffa10c68f74d 100644
(file)
--- 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;
int bus_kernel_fix_attach_mask(void) {
_cleanup_free_ char *mask = NULL;
- uint64_t m = (uint
32
_t) -1;
+ uint64_t m = (uint
64
_t) -1;
char buf[2+16+2];
int r;
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");
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");