picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sd-bus: catch up with current kdbus, don't do matches on kdbus monitor connections

This commit is contained in:
Lennart Poettering 2014-12-09 00:01:36 +01:00
parent e7100587da
commit 96ceff4283
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsystemd/sd-bus/bus-control.c
View File

@ -1180,6 +1180,10 @@ int bus_add_match_internal_kernel(
assert(bus);
/* Monitor streams don't support matches, make this a NOP */
if (bus->hello_flags & KDBUS_HELLO_MONITOR)
return 0;
bloom = alloca0(bus->bloom_size);
sz = ALIGN8(offsetof(struct kdbus_cmd_match, items));
@ -1392,6 +1396,10 @@ int bus_remove_match_internal_kernel(
assert(bus);
/* Monitor streams don't support matches, make this a NOP */
if (bus->hello_flags & KDBUS_HELLO_MONITOR)
return 0;
zero(m);
m.size = offsetof(struct kdbus_cmd_match, items);
m.cookie = cookie;