sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stop requiring that the binary in /usr/sbin/tor is still the same as the one 

that actually is the running tor when we try to stop or reload the daemon using
the init script.  If the process is called tor, running as debian-tor, and the
pid file agrees to then it probably is the Tor you want to stop (closes:
#491246).


svn:r16035
This commit is contained in:
Peter Palfrader 2008-07-17 23:48:39 +00:00
parent 813dc8f494
commit 9cd1852d1a
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
tor (0.2.0.30-2) unstable; urgency=low
* Stop requiring that the binary in /usr/sbin/tor is still the same as the
one that actually is the running tor when we try to stop or reload the
daemon using the init script. If the process is called tor, running as
debian-tor, and the pid file agrees to then it probably is the Tor you
want to stop (closes: #491246).
-- Peter Palfrader <weasel@debian.org> Fri, 18 Jul 2008 01:46:26 +0200
tor (0.2.0.30-1) unstable; urgency=low
* New upstream version.

10
debian/tor.init vendored
View File

@ -22,6 +22,8 @@ NAME=tor
DESC="tor daemon"
TORPIDDIR=/var/run/tor
TORPID=$TORPIDDIR/tor.pid
DAEMON_USER=debian-tor
DAEMON_NAME=tor
DEFAULTSFILE=/etc/default/$NAME
WAITFORDAEMON=60
ARGS=""
@ -144,12 +146,12 @@ case "$1" in
exit 0
fi
if start-stop-daemon --stop --signal INT --quiet --pidfile $TORPID --exec $DAEMON; then
if start-stop-daemon --stop --signal INT --quiet --pidfile $TORPID --name $DAEMON_NAME --user $DAEMON_USER; then
wait_for_deaddaemon $pid
echo "$NAME."
elif kill -0 $pid 2>/dev/null
then
echo "FAILED (Is $pid not $NAME? Is $DAEMON a different binary now?)."
echo "FAILED (Is $pid not $NAME?)."
else
echo "FAILED ($DAEMON died: process $pid not running; or permission denied)."
fi
@ -165,12 +167,12 @@ case "$1" in
check_config
if start-stop-daemon --stop --signal 1 --quiet --pidfile $TORPID --exec $DAEMON
if start-stop-daemon --stop --signal 1 --quiet --pidfile $TORPID --name $DAEMON_NAME --user $DAEMON_USER
then
echo "$NAME."
elif kill -0 $pid 2>/dev/null
then
echo "FAILED (Is $pid not $NAME? Is $DAEMON a different binary now?)."
echo "FAILED (Is $pid not $NAME?)."
else
echo "FAILED ($DAEMON died: process $pid not running; or permission denied)."
fi