update TODO

diff --git a/TODO b/TODO
index 0ea410953cc150e6109537dc48c50214b8c8d0a7..79864971daa8ef94bfb2db5aea31db31cf684ded 100644 (file)
--- a/TODO
+++ b/TODO
@@ -127,11 +127,9 @@ Features:
   - kdbus: matches against source or destination pids for an "strace -p"-like feel. Problem: The PID info needs to be available in userspace too...
   - kdbus: we need a way to distuingish messages we got due to monitoring from normal messages, since we want to bind methods only to the latter
   - kdbus: when we do "systemctl daemon-reexec" the call doesn't get properly cancelled
-  - figure out what to do when fields in the kdbus header and in the payload header do not match
   - longer term:
     * priority queues
     * priority inheritance
-  - fix sd-event hookup when we connect to multiple servers one after the other
 
 * sd-event
   - allow multiple signal handlers per signal?

diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c
index 4b694804cbec99c30b7be0471503c2523f6744ca..650e6b9659d051348cc68565ab64b9e88921a008 100644 (file)
--- a/src/libsystemd-bus/bus-kernel.c
+++ b/src/libsystemd-bus/bus-kernel.c
@@ -834,6 +834,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
         if (r < 0)
                 goto fail;
 
+        /* Override information from the user header with data from the kernel */
         if (k->src_id == KDBUS_SRC_ID_KERNEL)
                 m->sender = "org.freedesktop.DBus";
         else {