From: Kay Sievers <kay@vrfy.org>
Date: Mon, 6 Jul 2015 15:54:40 +0000 (+0200)
Subject: bus-proxyd: fix log message and explain dbus-1 compat matches
X-Git-Tag: v222~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=619b80a1c7caeb1d910d8d68a3700b8bdfc29a90;p=thirdparty%2Fsystemd.git

bus-proxyd: fix log message and explain dbus-1 compat matches
---

diff --git a/src/bus-proxyd/proxy.c b/src/bus-proxyd/proxy.c
index f9308f25c34..189ee969c76 100644
--- a/src/bus-proxyd/proxy.c
+++ b/src/bus-proxyd/proxy.c
@@ -144,6 +144,10 @@ static int proxy_create_local(Proxy *p, int in_fd, int out_fd, bool negotiate_fd
         return 0;
 }
 
+/*
+ * dbus-1 clients receive NameOwnerChanged and directed signals without
+ * subscribing to them; install the matches to receive them on kdbus.
+ */
 static int proxy_prepare_matches(Proxy *p) {
         _cleanup_free_ char *match = NULL;
         const char *unique;
@@ -200,7 +204,8 @@ static int proxy_prepare_matches(Proxy *p) {
 
         r = sd_bus_add_match(p->destination_bus, NULL, match, NULL, NULL);
         if (r < 0)
-                log_error_errno(r, "Failed to add match for NameAcquired: %m");
+                log_error_errno(r, "Failed to add match for directed signals: %m");
+                /* FIXME: temporarily ignore error to support older kdbus versions */
 
         return 0;
 }