hal ChangeLog,1.286,1.287 hal.conf.in,1.4,1.5

[David Zeuthen]

Update of /cvs/hal/hal
In directory gabe:/tmp/cvs-serv9199

Modified Files:
	ChangeLog hal.conf.in 
Log Message:
2004-09-12  David Zeuthen  <david at fubar.dk>

	* hal.conf.in: Fixup this file as it was broken. Reported by 
	Kay Sievers <kay.sievers at vrfy.org>.



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -d -r1.286 -r1.287
--- ChangeLog	12 Sep 2004 09:49:28 -0000	1.286
+++ ChangeLog	12 Sep 2004 09:57:59 -0000	1.287
@@ -1,3 +1,8 @@
+2004-09-12  David Zeuthen  <david at fubar.dk>
+
+	* hal.conf.in: Fixup this file as it was broken. Reported by 
+	Kay Sievers <kay.sievers at vrfy.org>.
+
 2004-09-12  Kay Sievers  <kay.sievers at vrfy.org>
 
 	* hald/linux/volume_id/volume_id.c: (probe_vfat): Patch from

Index: hal.conf.in
===================================================================
RCS file: /cvs/hal/hal/hal.conf.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hal.conf.in	3 Sep 2004 18:28:56 -0000	1.4
+++ hal.conf.in	12 Sep 2004 09:57:59 -0000	1.5
@@ -3,36 +3,15 @@
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
 
-
   <!-- This configuration file specifies the required security policies
        for the HAL to work. -->
 
-  <!-- Only user @HAL_USER@ can own the HAL service and be an agent -->
-  <!-- policy user="@HAL_USER@" We require root to sniff mii registers -->
+  <!-- Only root or user @HAL_USER@ can own the HAL service -->
   <policy user="@HAL_USER@">
     <allow own="org.freedesktop.Hal"/>
-
-    <allow send_interface="org.freedesktop.Hal.AgentManager"
-           send_destination="org.freedesktop.Hal"/>
-    <allow receive_interface="org.freedesktop.Hal.AgentManager"
-           receive_sender="org.freedesktop.Hal"/>
   </policy>
-
-  <!-- Only root can use the Linux.Hotplug interface -->
   <policy user="root">
-    <allow send_interface="org.freedesktop.Hal.Linux.Hotplug"
-           send_destination="org.freedesktop.Hal"/>
-    <allow receive_interface="org.freedesktop.Hal.Linux.Hotplug"
-           receive_sender="org.freedesktop.Hal"/>
-  </policy>
-
-  <!-- Any user in the @HAL_GROUP@ group can use the AgentManager interface -->
-  <!-- policy group="@HAL_GROUP@" Doesn't work on dbus 0.20. Works in CVS -->
-  <policy user="@HAL_USER@">
-    <allow send_interface="org.freedesktop.Hal.AgentManager"
-           send_destination="org.freedesktop.Hal"/>
-    <allow receive_interface="org.freedesktop.Hal.AgentManager"
-           receive_sender="org.freedesktop.Hal"/>
+    <allow own="org.freedesktop.Hal"/>
   </policy>
 
   <!-- Allow anyone to invoke methods on the Manager and Device interfaces -->