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
---
 test/data/valid-config-files/debug-allow-all-sha1.conf.in | 4 ++--
 test/data/valid-config-files/debug-allow-all.conf.in      | 4 ++--
 test/data/valid-config-files/system.d/test.conf           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'test')

diff --git a/test/data/valid-config-files/debug-allow-all-sha1.conf.in b/test/data/valid-config-files/debug-allow-all-sha1.conf.in
index 6db93f0c..7fb76c55 100644
--- a/test/data/valid-config-files/debug-allow-all-sha1.conf.in
+++ b/test/data/valid-config-files/debug-allow-all-sha1.conf.in
@@ -8,8 +8,8 @@
   <servicedir>@TEST_SERVICE_DIR@</servicedir>
   <auth>DBUS_COOKIE_SHA1</auth>
   <policy context="default">
-    <allow send="*"/>
-    <allow receive="*"/>
+    <allow send_interface="*"/>
+    <allow receive_interface="*"/>
     <allow own="*"/>
     <allow user="*"/>
   </policy>
diff --git a/test/data/valid-config-files/debug-allow-all.conf.in b/test/data/valid-config-files/debug-allow-all.conf.in
index 0dd8ed4a..ea1aec8c 100644
--- a/test/data/valid-config-files/debug-allow-all.conf.in
+++ b/test/data/valid-config-files/debug-allow-all.conf.in
@@ -7,8 +7,8 @@
   <listen>unix:tmpdir=@TEST_SOCKET_DIR@</listen>
   <servicedir>@TEST_SERVICE_DIR@</servicedir>
   <policy context="default">
-    <allow send="*"/>
-    <allow receive="*"/>
+    <allow send_interface="*"/>
+    <allow receive_interface="*"/>
     <allow own="*"/>
     <allow user="*"/>
   </policy>
diff --git a/test/data/valid-config-files/system.d/test.conf b/test/data/valid-config-files/system.d/test.conf
index a683679e..3d1b2f54 100644
--- a/test/data/valid-config-files/system.d/test.conf
+++ b/test/data/valid-config-files/system.d/test.conf
@@ -9,12 +9,12 @@
        this user can only send the one kind of message -->
   <policy user="fooserviceuser">
     <allow own="org.foo.FooService"/>
-    <allow send="org.foo.FooBroadcastMessage"/>
+    <allow send_interface="org.foo.FooBroadcastInterface"/>
   </policy>
 
   <!-- Allow any connection to receive the message, but 
        only if the message is sent by the owner of FooService -->
   <policy context="default">
-    <allow receive="org.foo.FooBroadcastMessage" receive_from="org.foo.FooService"/>
+    <allow receive_interface="org.foo.FooBroadcastInterface" receive_service="org.foo.FooService"/>
   </policy>
 </busconfig>
-- 
cgit