Merge branch 'dbus-1.8'

2 files changed, 6 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index b49608aa..2e4bd822 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,11 @@
 D-Bus 1.9.4 (UNRELEASED)
 ==
 
-...
+Fixes:
+
+• Send back an AccessDenied error if the addressed recipient is not allowed
+  to receive a message (and in builds with assertions enabled, don't
+  assert under the same conditions). (fd.o #86194, Jacek Bukarewicz)
 
 D-Bus 1.9.2 (2014-11-10)
 ==
diff --git a/bus/bus.c b/bus/bus.c
index 47cc3452..f0d980e5 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -1660,7 +1660,7 @@ bus_context_check_security_policy (BusContext     *context,
       complain_about_message (context, DBUS_ERROR_ACCESS_DENIED,
           "Rejected receive message", toggles,
           message, sender, proposed_recipient, requested_reply,
-          (addressed_recipient == proposed_recipient), NULL);
+          (addressed_recipient == proposed_recipient), error);
       _dbus_verbose ("security policy disallowing message due to recipient policy\n");
       return FALSE;
     }