hal: Branch 'master'

[Martin Pitt]

 hal.conf.in |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 6e73f94cf5a195835a0a6b957aad363c2b79a265
Author: Colin Walters <walters at verbum.org>
Date:   Wed Jan 21 01:24:14 2009 +0100

    aallowllow calling KillSwitch methods in D-Bus configuration
    
    hal.conf.in: Update dbus permissions to include KillSwitch, which
    NetworkManager needs. Taken from Fedora:
    http://cvs.fedoraproject.org/viewvc//devel/hal/hal-dbus-perms.patch?view=markup

diff --git a/hal.conf.in b/hal.conf.in
index ef97b8f..823e40f 100644
--- a/hal.conf.in
+++ b/hal.conf.in
@@ -16,6 +16,8 @@
 
   <!-- Allow anyone to invoke methods on the Manager and Device interfaces -->
   <policy context="default">
+    <allow send_destination="org.freedesktop.Hal"
+           send_interface="org.freedesktop.DBus.Introspectable"/>
     <allow send_interface="org.freedesktop.Hal.Manager"/>
     <allow send_interface="org.freedesktop.Hal.Device"/>
     <allow receive_interface="org.freedesktop.Hal.Manager"
@@ -26,6 +28,7 @@
     <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.KillSwitch"/>
     <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
     <allow receive_interface="org.freedesktop.Hal.Device.SystemPowerManagement"
 	   receive_sender="org.freedesktop.Hal"/>