hal ChangeLog,1.730,1.731 hal.conf.in,1.8,1.9

[Richard Hughes]

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

Modified Files:
	ChangeLog hal.conf.in 
Log Message:
* hal.conf.in: Add a fallback for the root user for distros that do not have working at_console support. Also refactor these a little to make updating easier, and to stop the multiple matches overhead.

Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.730
retrieving revision 1.731
diff -u -d -r1.730 -r1.731
--- ChangeLog	9 Jan 2006 15:19:49 -0000	1.730
+++ ChangeLog	10 Jan 2006 19:03:45 -0000	1.731
@@ -1,3 +1,11 @@
+2006-01-08  Richard Hughes <richard at hughsie.com>
+
+	* hal.conf.in: Add a fallback for the root user for distros that do
+	not have working at_console support. Also refactor these a little to
+	make updating easier, and to stop the multiple matches overhead.
+	We use user="0" because some paranoid system administrators rename 
+	the user for uid 0 and make a dummy user named root.
+
 2006-01-09  Danny Kukawka  <danny.kukawka at web.de>
 
 	* libhal-storage/libhal-storage.c: (libhal_drive_find_all_volumes):

Index: hal.conf.in
===================================================================
RCS file: /cvs/hal/hal/hal.conf.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- hal.conf.in	6 Jan 2006 15:44:12 -0000	1.8
+++ hal.conf.in	10 Jan 2006 19:03:45 -0000	1.9
@@ -25,31 +25,27 @@
            receive_sender="org.freedesktop.Hal"/>
   </policy>
 
+  <!-- Default policy for the exported interfaces -->
   <policy context="default">
     <deny send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
-  </policy>
-  <policy at_console="true">
-    <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
-  </policy>
-
-  <policy context="default">
     <deny send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
-  </policy>
-  <policy at_console="true">
-    <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
-  </policy>
-
-  <policy context="default">
     <deny send_interface="org.freedesktop.Hal.Device.Volume"/>
+    <deny send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
   </policy>
+
+  <!-- This will not work if pam_console support is not enabled -->
   <policy at_console="true">
+    <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
+    <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
     <allow send_interface="org.freedesktop.Hal.Device.Volume"/>
+    <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
   </policy>
 
-  <policy context="default">
-    <deny send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
-  </policy>
-  <policy at_console="true">
+  <!-- You can change this to a more suitable user, or make per-group -->
+  <policy user="0">
+    <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
+    <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
+    <allow send_interface="org.freedesktop.Hal.Device.Volume"/>
     <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
   </policy>