1 files changed, 20 insertions, 5 deletions

diff --git a/src/bus-proxyd/proxy.c b/src/bus-proxyd/proxy.c
index c37b09b9c0..88800f5e7f 100644
--- a/src/bus-proxyd/proxy.c
+++ b/src/bus-proxyd/proxy.c
@@ -261,9 +261,18 @@ int proxy_new(Proxy **out, int in_fd, int out_fd, const char *destination) {
 }
 
 Proxy *proxy_free(Proxy *p) {
+        ProxyActivation *activation;
+
         if (!p)
                 return NULL;
 
+        while ((activation = p->activations)) {
+                LIST_REMOVE(activations_by_proxy, p->activations, activation);
+                sd_bus_message_unref(activation->request);
+                sd_bus_slot_unref(activation->slot);
+                free(activation);
+        }
+
         sd_bus_flush_close_unref(p->local_bus);
         sd_bus_flush_close_unref(p->destination_bus);
         set_free_free(p->owned_names);
@@ -644,6 +653,10 @@ static int process_hello(Proxy *p, sd_bus_message *m) {
         if (r < 0)
                 return log_error_errno(r, "Failed to append sender to NameAcquired message: %m");
 
+        r = sd_bus_message_set_destination(n, p->destination_bus->unique_name);
+        if (r < 0)
+                return log_error_errno(r, "Failed to set destination for NameAcquired message: %m");
+
         r = bus_seal_synthetic_message(p->local_bus, n);
         if (r < 0)
                 return log_error_errno(r, "Failed to seal NameAcquired message: %m");
@@ -757,19 +770,21 @@ static int proxy_process_destination_to_local(Proxy *p) {
                         return r;
 
                 /* If the peer tries to send a reply and it is
-                 * rejected with EPERM by the kernel, we ignore the
+                 * rejected with EBADSLT by the kernel, we ignore the
                  * error. This catches cases where the original
                  * method-call didn't had EXPECT_REPLY set, but the
                  * proxy-peer still sends a reply. This is allowed in
                  * dbus1, but not in kdbus. We don't want to track
                  * reply-windows in the proxy, so we simply ignore
-                 * EPERM for all replies. The only downside is, that
+                 * EBADSLT for all replies. The only downside is, that
                  * callers are no longer notified if their replies are
                  * dropped. However, this is equivalent to the
                  * caller's timeout to expire, so this should be
                  * acceptable. Nobody sane sends replies without a
                  * matching method-call, so nobody should care. */
-                if (r == -EPERM && m->reply_cookie > 0)
+
+                /* FIXME: remove -EPERM when kdbus is updated */
+                if ((r == -EPERM || r == -EBADSLT) && m->reply_cookie > 0)
                         return 1;
 
                 /* Return the error to the client, if we can */
@@ -850,8 +865,8 @@ static int proxy_process_local_to_destination(Proxy *p) {
                         if (r == -EREMCHG)
                                 continue;
 
-                        /* see above why EPERM is ignored for replies */
-                        if (r == -EPERM && m->reply_cookie > 0)
+                        /* see above why EBADSLT is ignored for replies */
+                        if ((r == -EPERM || r == -EBADSLT) && m->reply_cookie > 0)
                                 return 1;
 
                         synthetic_reply_method_errnof(m, r, "Failed to forward message we got from local: %m");