torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Always give a shell (/bin/sh) when we use su(1) in our init script (closes: #421465)

Browse Source 
svn:r10124
This commit is contained in:
Peter Palfrader
2007-05-06 12:46:08 +00:00
parent 225ea3dba3
commit f8cccdbe50
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/changelog
Vendored
+7
View File
@@ -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
debian/tor.init
Vendored
+6 -6
View File
@@ -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