summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Bukarewicz <j.bukarewicz@samsung.com>2014-11-14 18:39:38 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-11-14 18:40:50 +0000
commit8ee1a7b57cfb99259164e45922df556382c0e0ad (patch)
treef124fdfa65ed7d034e7e60421e8f128981c03e14
parent3210bda8013489484d4ab9f6c4adaf8d662bf6c9 (diff)
downloaddbus-8ee1a7b57cfb99259164e45922df556382c0e0ad.tar.gz
Set error when message delivery is denied due to receive rule
This makes bus_context_check_security_policy follow convention of setting errors if function indicates failure and has error parameter. Notable implication is that AccessDenied error will be sent if sending message to addressed recipient is denied due to receive rule. Previously, message was silently dropped. This also fixes assertion failure when message is denied at addressed recipient while sending pending auto activation messages. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=86194
-rw-r--r--bus/bus.c2
1 files changed, 1 insertions, 1 deletions
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;
}