[PATCH] remove use of at_console in the D-Bus configuration file

[David Zeuthen]

The main reason for this is that PolicyKit is used _anyway_ to control
access to methods. And using pam_console to do this breaks when you
try to e.g. run a power manager on the login screen as we're doing in
Fedora 9 with g-p-m and the new gdm.
---
 hal.conf.in |   20 ++------------------
 1 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/hal.conf.in b/hal.conf.in
index 747e108..ef97b8f 100644
--- a/hal.conf.in
+++ b/hal.conf.in
@@ -37,25 +37,9 @@
 	   receive_sender="org.freedesktop.Hal"/>
   </policy>
 
-  <!-- Default policy for the exported interfaces -->
+  <!-- Default policy for the exported interfaces; if PolicyKit is not used
+       for access control you will need to modify this -->
   <policy context="default">
-    <deny send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
-    <deny send_interface="org.freedesktop.Hal.Device.VideoAdapterPM"/>
-    <deny send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
-    <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>
-
-  <!-- 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.VideoAdapterPM"/>
     <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
-- 
1.5.4.3


--=-F0rX2m/lpfr2LiZ3coXN--