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)
---
 test/data/valid-config-files/many-rules.conf    | 16 ++++++++--------
 test/data/valid-config-files/system.d/test.conf |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'test/data')

diff --git a/test/data/valid-config-files/many-rules.conf b/test/data/valid-config-files/many-rules.conf
index 57ea5ec9..f68430e5 100644
--- a/test/data/valid-config-files/many-rules.conf
+++ b/test/data/valid-config-files/many-rules.conf
@@ -13,16 +13,16 @@
     <deny receive_interface="org.freedesktop.System" receive_member="Reboot"/>
     <deny send_path="/foo/bar/SystemObjectThing" send_member="Reboot"/> 
     <deny own="org.freedesktop.System"/>
-    <deny send_service="org.freedesktop.System"/>
-    <deny receive_service="org.freedesktop.System"/>
+    <deny send_destination="org.freedesktop.System"/>
+    <deny receive_sender="org.freedesktop.System"/>
     <deny user="root"/>
     <deny group="root"/>
     <allow send_type="error"/>
     <allow send_type="method_call"/>
     <allow send_type="method_return"/>
     <allow send_type="signal"/>
-    <deny send_service="org.freedesktop.Bar" send_interface="org.freedesktop.Foo"/>
-    <deny send_service="org.freedesktop.Bar" send_interface="org.freedesktop.Foo" send_type="method_call"/>
+    <deny send_destination="org.freedesktop.Bar" send_interface="org.freedesktop.Foo"/>
+    <deny send_destination="org.freedesktop.Bar" send_interface="org.freedesktop.Foo" send_type="method_call"/>
   </policy>
 
   <policy context="mandatory">
@@ -31,16 +31,16 @@
     <deny receive_interface="org.freedesktop.System" receive_member="Reboot"/>
     <deny send_path="/foo/bar/SystemObjectThing" send_member="Reboot"/> 
     <deny own="org.freedesktop.System"/>
-    <deny send_service="org.freedesktop.System"/>
-    <deny receive_service="org.freedesktop.System"/>
+    <deny send_destination="org.freedesktop.System"/>
+    <deny receive_sender="org.freedesktop.System"/>
     <deny user="root"/>
     <deny group="root"/>
     <allow send_type="error"/>
     <allow send_type="method_call"/>
     <allow send_type="method_return"/>
     <allow send_type="signal"/>
-    <deny send_service="org.freedesktop.Bar" send_interface="org.freedesktop.Foo"/>
-    <deny send_service="org.freedesktop.Bar" send_interface="org.freedesktop.Foo" send_type="method_call"/>
+    <deny send_destination="org.freedesktop.Bar" send_interface="org.freedesktop.Foo"/>
+    <deny send_destination="org.freedesktop.Bar" send_interface="org.freedesktop.Foo" send_type="method_call"/>
   </policy>
 
   <limit name="max_incoming_bytes">5000</limit>   
diff --git a/test/data/valid-config-files/system.d/test.conf b/test/data/valid-config-files/system.d/test.conf
index 10a79847..5b60a1fc 100644
--- a/test/data/valid-config-files/system.d/test.conf
+++ b/test/data/valid-config-files/system.d/test.conf
@@ -15,6 +15,6 @@
   <!-- Allow any connection to receive the message, but 
        only if the message is sent by the owner of FooService -->
   <policy context="default">
-    <allow receive_interface="org.foo.FooBroadcastInterface" receive_service="org.foo.FooService"/>
+    <allow receive_interface="org.foo.FooBroadcastInterface" receive_sender="org.foo.FooService"/>
   </policy>
 </busconfig>
-- 
cgit