From d0c588575e3e2911eacb098fac26f02d1010cbfd Mon Sep 17 00:00:00 2001
From: Havoc Pennington <hp@redhat.com>
Date: Wed, 20 Aug 2003 14:48:04 +0000
Subject: 2003-08-19  Havoc Pennington  <hp@pobox.com>

	* dbus/dbus-message.c (decode_string_field): support FIELD_SENDER
	(dbus_message_is_error): fix this function

	* bus/dbus-daemon-1.1: clarify logic on when <deny>/<allow> rules
	match

	* bus/policy.c (bus_client_policy_check_can_receive): fix code to
	reflect clarified man page
	(bus_client_policy_check_can_send): ditto

	* bus/session.conf.in: fixup

	* bus/system.conf.in: fixup
---
 bus/system.conf.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'bus/system.conf.in')

diff --git a/bus/system.conf.in b/bus/system.conf.in
index bd454ff3..96513a75 100644
--- a/bus/system.conf.in
+++ b/bus/system.conf.in
@@ -34,16 +34,16 @@
 
   <policy context="default">
     <!-- Deny everything then punch holes -->
-    <deny send="*"/>
-    <deny receive="*"/>
+    <deny send_interface="*"/>
+    <deny receive_interface="*"/>
     <deny own="*"/>
     <!-- But allow all users to connect -->
     <allow user="*"/>
     <!-- Allow anyone to talk to the message bus -->
     <!-- FIXME I think currently these allow rules are always implicit 
          even if they aren't in here -->
-    <allow send_to="org.freedesktop.DBus"/>
-    <allow receive_from="org.freedesktop.DBus"/>
+    <allow send_service="org.freedesktop.DBus"/>
+    <allow receive_service="org.freedesktop.DBus"/>
   </policy>
 
   <!-- Config files are placed here that among other things, punch 
-- 
cgit 


From a683a80c409cc4f2e57ba6a3e60d52f91b8657d0 Mon Sep 17 00:00:00 2001
From: Havoc Pennington <hp@redhat.com>
Date: Sun, 21 Sep 2003 19:53:56 +0000
Subject: 2003-09-21  Havoc Pennington  <hp@pobox.com>

	Get matching rules mostly working in the bus; only actually
	parsing the rule text remains. However, the client side of
	"signal connections" hasn't been started, this patch is only the
	bus side.

	* dbus/dispatch.c: fix for the matching rules changes

	* bus/driver.c (bus_driver_handle_remove_match)
	(bus_driver_handle_add_match): send an ack reply from these
	method calls

	* glib/dbus-gproxy.c (dbus_gproxy_begin_call): fix order of
	arguments, reported by Seth Nickell

	* bus/config-parser.c (append_rule_from_element): support
	eavesdrop=true|false attribute on policies so match rules
	can be prevented from snooping on the system bus.

	* bus/dbus-daemon-1.1.in: consistently use terminology "sender"
	and "destination" in attribute names; fix some docs bugs;
	add eavesdrop=true|false attribute

	* bus/driver.c (bus_driver_handle_add_match)
	(bus_driver_handle_remove_match): handle AddMatch, RemoveMatch
	messages

	* dbus/dbus-protocol.h (DBUS_SERVICE_ORG_FREEDESKTOP_BROADCAST): get
	rid of broadcast service concept, signals are just always broadcast

	* bus/signals.c, bus/dispatch.c, bus/connection.c, bus/bus.c:
	mostly implement matching rules stuff (currently only exposed as signal
	connections)
---
 bus/system.conf.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bus/system.conf.in')

diff --git a/bus/system.conf.in b/bus/system.conf.in
index 96513a75..122ea1b6 100644
--- a/bus/system.conf.in
+++ b/bus/system.conf.in
@@ -42,8 +42,8 @@
     <!-- Allow anyone to talk to the message bus -->
     <!-- FIXME I think currently these allow rules are always implicit 
          even if they aren't in here -->
-    <allow send_service="org.freedesktop.DBus"/>
-    <allow receive_service="org.freedesktop.DBus"/>
+    <allow send_destination="org.freedesktop.DBus"/>
+    <allow receive_sender="org.freedesktop.DBus"/>
   </policy>
 
   <!-- Config files are placed here that among other things, punch 
-- 
cgit