X-Git-Url: https://git.distorted.org.uk/~mdw/hippotat/blobdiff_plain/e7f20f23664234d4a36c4af12439195fc36181b6..216519e342072164533ae340141d585c638db8e2:/debian/hippotat.hippotatd.init

diff --git a/debian/hippotat.hippotatd.init b/debian/hippotat.hippotatd.init
index ac91e3a..c8b3dc2 100644
--- a/debian/hippotat.hippotatd.init
+++ b/debian/hippotat.hippotatd.init
@@ -10,7 +10,7 @@
 # Description:          Asinine IP over HTTP server
 ### END INIT INFO
 
-DAEMON=/usr/sbin/hippotat
+DAEMON=/usr/sbin/hippotatd
 MASTER_CONFIG=/etc/hippotat/master.cfg
 USER=Debian-hippotat
 PIDFILE=/var/run/hippotat/hippotatd.pid
@@ -19,7 +19,7 @@ CHECK_FIREWALL=true
 # HIPPOTATD_ARGS
 AS_USER=as_user_userv
 DESCRIPTION='Asinine IP over HTTP server'
-if type -p authbind >/dev/null 2>&1; then AUTHBIND=authbind; fi
+if type authbind >/dev/null 2>&1; then AUTHBIND=authbind; fi
 
 test -e /etc/default/hippotatd &&
 . /etc/default/hippotatd
@@ -40,7 +40,7 @@ as_user_userv () {
 
 ssd () {
 	set +e
-	start-stop-daemon --start --quiet --user $USER --pidfile=$PIDFILE "$@"
+	start-stop-daemon --quiet --user $USER --pidfile=$PIDFILE "$@"
 	rc=$?
 	set -e
 }
@@ -71,12 +71,13 @@ check_firewall () {
 do_start () {
 	check_firewall
 	ensure_dirs
-	ssd	--chuid $USER --startas				\
+	ssd	--chuid $USER --start 				\
+		--startas /bin/sh -- -ec '"$@"' x		\
 		$AUTHBIND $DAEMON --daemon --pidfile=$PIDFILE	\
 		--syslog-facility=$LOGFACILITY $HIPPOTATD_ARGS
 }
 do_stop () {
-	ssd	--stop --retry 5
+	ssd	--stop --oknodo --retry 5
 }
 
 case "$1" in
@@ -84,12 +85,14 @@ start)
 	log_daemon_msg "Starting $DESCRIPTION" hippotatd
 	do_start
 	log_end_msg $rc
+	exit $rc
 	;;
 
 stop)
 	log_daemon_msg "Stopping $DESCRIPTION" hippotatd
 	do_stop
 	log_end_msg $rc
+	exit $rc
 	;;
 
 restart|force-reload)