From: David Herrmann <dh.herrmann@gmail.com>
Date: Thu, 16 Jul 2015 12:35:15 +0000 (+0200)
Subject: sd-bus: destination-matches cannot match NameOwnerChanged
X-Git-Tag: v223~94
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1af5f746d569f013595bb16ca113741ee306f04a;p=thirdparty%2Fsystemd.git

sd-bus: destination-matches cannot match NameOwnerChanged

Make sure we don't install NameOwnerChanged matches if the caller passed
a destination='' match (except if it is the broadcast address). Per spec,
all NameOwnerChanged signals are broadcasts.

Only the NameLost/NameAcquired signals are unicasts, but those are never
received through sd-bus. Instead, the bus-proxy synthesizes them and it
already installs proper matches for them.
---

diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c
index a38c5c50fca..526e1aa89ff 100644
--- a/src/libsystemd/sd-bus/bus-control.c
+++ b/src/libsystemd/sd-bus/bus-control.c
@@ -1345,6 +1345,10 @@ int bus_add_match_internal_kernel(
                         else if (r > 0)
                                 sz += ALIGN8(offsetof(struct kdbus_item, id) + sizeof(uint64_t));
 
+                        /* if not a broadcast, it cannot be a name-change */
+                        if (r <= 0 || dst_id != KDBUS_DST_ID_BROADCAST)
+                                matches_name_change = false;
+
                         break;
                 }