From 4428682dbda6112df3c26ea7580c32f5e2755918 Mon Sep 17 00:00:00 2001
From: Brett Goulder <predatorfreak@dcaf-security.org>
Date: Tue, 20 May 2008 00:48:26 -0400
Subject: [PATCH] hal: Running as haldaemon breaks automounting, *sigh*.

---
 hal/.md5sum  |  4 ++--
 hal/hal.conf | 11 +++++------
 hal/rc.hald  |  3 +--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/hal/.md5sum b/hal/.md5sum
index 4cf578ed6..eb0784453 100644
--- a/hal/.md5sum
+++ b/hal/.md5sum
@@ -1,3 +1,3 @@
 750cf074e88b6fb7012f26d99cd39b9b  hal-0.5.11.tar.gz
-7cb56ce5687fa8dcdc870821844240eb  hal.conf
-ef74f2a02bea1462976c9ed56f1a6b97  rc.hald
+d8ce27a76d7cb13ce142cdc33816c8bd  hal.conf
+cc3d04e7ac09e15f33c530725f43e641  rc.hald
diff --git a/hal/hal.conf b/hal/hal.conf
index 958d39b9b..fce6b4407 100644
--- a/hal/hal.conf
+++ b/hal/hal.conf
@@ -10,9 +10,9 @@
   <policy user="haldaemon">
     <allow own="org.freedesktop.Hal"/>
   </policy>
-	<policy user="0">
-		<allow own="org.freedesktop.Hal"/>
-	</policy>
+  <policy user="root">
+    <allow own="org.freedesktop.Hal"/>
+  </policy>
   <policy group="plugdev">
     <allow own="org.freedesktop.Hal"/>
   </policy>
@@ -49,7 +49,7 @@
     <deny send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
   </policy>
 
-  <policy user="0">
+  <policy user="root">
     <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
     <allow send_interface="org.freedesktop.Hal.Device.VideoAdapterPM"/>
     <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
@@ -65,5 +65,4 @@
     <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
   </policy>
 
-</busconfig>
-
+</busconfig>
\ No newline at end of file
diff --git a/hal/rc.hald b/hal/rc.hald
index 022e0fd81..43629ddd1 100644
--- a/hal/rc.hald
+++ b/hal/rc.hald
@@ -5,8 +5,7 @@
 
 case $1 in
 	start)
-		# Run as haldaemon, not root.
-		su haldaemon -s /bin/sh -c '/usr/sbin/hald --daemon=yes --use-syslog'
+		/usr/sbin/hald --daemon=yes --use-syslog
 		;;
 	stop)
 		killall -q /usr/sbin/hald