[or-cvs] r13788: Run --verify-config before start/reload/restart as root. No (tor/trunk/debian)

[weasel@xxxxxxxx]

Author: weasel
Date: 2008-02-29 19:51:37 -0500 (Fri, 29 Feb 2008)
New Revision: 13788

Modified:
   tor/trunk/debian/changelog
   tor/trunk/debian/tor.init
Log:
Run --verify-config before start/reload/restart as root.  No longer su - to
debian-tor tor run it.  Given that we now even start Tor as root (it setuids
later on) this should be fine (closes: #468566).


Modified: tor/trunk/debian/changelog
===================================================================
--- tor/trunk/debian/changelog	2008-03-01 00:49:03 UTC (rev 13787)
+++ tor/trunk/debian/changelog	2008-03-01 00:51:37 UTC (rev 13788)
@@ -1,3 +1,11 @@
+tor (0.2.0.20-rc-1+XX) XXperimental; urgency=low
+
+  * Run --verify-config before start/reload/restart as root.  No longer
+    su - to debian-tor tor run it.  Given that we now even start Tor as
+    root (it setuids later on) this should be fine (closes: #468566).
+
+ -- Peter Palfrader <weasel@xxxxxxxxxx>  Sat,  1 Mar 2008 01:49:58 +0100
+
 tor (0.2.0.20-rc-1) experimental; urgency=low
 
   * New upstream version.

Modified: tor/trunk/debian/tor.init
===================================================================
--- tor/trunk/debian/tor.init	2008-03-01 00:49:03 UTC (rev 13787)
+++ tor/trunk/debian/tor.init	2008-03-01 00:51:37 UTC (rev 13788)
@@ -90,9 +90,9 @@
 }
 
 check_config () {
-	if ! su -s /bin/sh -c "$DAEMON --verify-config" debian-tor > /dev/null; then
+	if ! "$DAEMON --verify-config" > /dev/null; then
 		echo "ABORTED: Tor configuration invalid:" >&2
-		su -s /bin/sh -c "$DAEMON --verify-config" debian-tor >&2
+		$DAEMON --verify-config >&2
 		exit 1
 	fi
 }