diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/tor.init | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 61d09bfc53..63c2bcac9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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@debian.org> Sat, 1 Mar 2008 01:49:58 +0100 + tor (0.2.0.20-rc-1) experimental; urgency=low * New upstream version. diff --git a/debian/tor.init b/debian/tor.init index 29af4d2eec..cef735fe3f 100644 --- a/debian/tor.init +++ b/debian/tor.init @@ -90,9 +90,9 @@ check_torpiddir () { } 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 } |