Merge in upstream/2.4+dfsg into experimental.

[shibboleth/sp.git] / configs / shibd-debian.in

diff --git a/configs/shibd-debian.in b/configs/shibd-debian.in
index 75c2fa2..da41cd2 100644 (file)
--- a/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@ -99,12 +99,11 @@ start)
 stop)
     echo -n "Stopping $DESC: "
     start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-        --exec $DAEMON
+        --retry TERM/30/KILL/5 --exec $DAEMON
     echo "$NAME."
     ;;
 restart|force-reload)
     prepare_environment
-
     echo -n "Restarting $DESC: "
     start-stop-daemon --stop --quiet --pidfile $PIDFILE \
         --exec $DAEMON