diff options
| author | Peter Palfrader <peter@palfrader.org> | 2007-05-06 12:46:08 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2007-05-06 12:46:08 +0000 |
| commit | f8cccdbe50a9a0e01193ca915fa2eb1c286c7995 (patch) | |
| tree | cff36c02a61c2d091b18b2399ee23320a1b3a102 | |
| parent | 225ea3dba38f6b3143ba570bd77afc107af98768 (diff) | |
| download | tor-f8cccdbe50a9a0e01193ca915fa2eb1c286c7995.tar.gz tor-f8cccdbe50a9a0e01193ca915fa2eb1c286c7995.zip | |
Always give a shell (/bin/sh) when we use su(1) in our init script (closes: #421465)
svn:r10124
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/tor.init | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 41d6efe351..25c489c913 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +tor (0.1.2.13-3) unstable; urgency=low + + * Always give a shell (/bin/sh) when we use su(1) in our init script + (closes: #421465). + + -- Peter Palfrader <weasel@debian.org> Sun, 6 May 2007 14:44:11 +0200 + tor (0.1.2.13-2) unstable; urgency=low * In options_init_from_torrc()'s error path only config_free() options diff --git a/debian/tor.init b/debian/tor.init index 7a69ae621a..e4a9310666 100644 --- a/debian/tor.init +++ b/debian/tor.init @@ -90,9 +90,9 @@ case "$1" in fi echo "Starting $DESC: $NAME..." - if ! su -c "$DAEMON --verify-config" debian-tor > /dev/null; then + if ! su -s /bin/sh -c "$DAEMON --verify-config" debian-tor > /dev/null; then echo "ABORTED: Tor configuration invalid:" >&2 - su -c "$DAEMON --verify-config" debian-tor >&2 + su -s /bin/sh -c "$DAEMON --verify-config" debian-tor >&2 exit 1 fi @@ -131,9 +131,9 @@ case "$1" in exit 0 fi - if ! su -c "$DAEMON --verify-config" debian-tor > /dev/null; then + if ! su -s /bin/sh -c "$DAEMON --verify-config" debian-tor > /dev/null; then echo "ABORTED: Tor configuration invalid:" >&2 - su -c "$DAEMON --verify-config" debian-tor >&2 + su -s /bin/sh -c "$DAEMON --verify-config" debian-tor >&2 exit 1 fi @@ -148,9 +148,9 @@ case "$1" in fi ;; restart) - if ! su -c "$DAEMON --verify-config" debian-tor > /dev/null; then + if ! su -s /bin/sh -c "$DAEMON --verify-config" debian-tor > /dev/null; then echo "Restarting Tor ABORTED: Tor configuration invalid:" >&2 - su -c "$DAEMON --verify-config" debian-tor >&2 + su -s /bin/sh -c "$DAEMON --verify-config" debian-tor >&2 exit 1 fi |