[systemd-commits] 2 commits - TODO src/libsystemd

[Lennart Poettering]

 TODO                                |    1 +
 src/libsystemd/sd-bus/bus-control.c |    8 ++++++++
 2 files changed, 9 insertions(+)

New commits:
commit 4a02e68602be9f6f3caac0f6195672490f715fe1
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Dec 9 00:08:31 2014 +0100

    update TODO

diff --git a/TODO b/TODO
index b0ae84a..37f375c 100644
--- a/TODO
+++ b/TODO
@@ -302,6 +302,7 @@ Features:
   ReadOnlyDirectories=... for whitelisting files for a service.
 
 * sd-bus:
+  - make dsrt happy, and change userspace header for kdbus to yyyyuta{tv}v
   - kdbus: PID/TID goes missing for method calls from outside the PID namespace?
   - kdbus: the kernel should not allow messages to be delivered that have a reply serial != 0, reply-expect unset, but no appropriate window
   - kdbus: timestamps on kernel's NameOwnerChanged messages?

commit 96ceff428359b8f757d9d4da1f5da13bb9b5ab2e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Dec 9 00:01:36 2014 +0100

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

diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c
index 6a9e9b2..261cf0d 100644
--- a/src/libsystemd/sd-bus/bus-control.c
+++ b/src/libsystemd/sd-bus/bus-control.c
@@ -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;