Merge branch 'upstream' into bug/init

Conflicts:
	configs/shibd-debian.in

diff --combined configs/shibd-debian.in
index 7ffc1f6,13e8240..3b59c86
--- 1/configs/shibd-debian.in
--- 2/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@@ -7,8 -7,8 +7,8 @@@
  # Default-Stop: 0 1 6
  # Short-Description: Shibboleth 2 Service Provider Daemon
  # Description: Starts the separate daemon used by the Shibboleth
 -# Apache module to manage sessions and to retrieve
 -# attributes from Shibboleth Identity Providers.
 +#              Apache module to manage sessions and to retrieve
 +#              attributes from Shibboleth Identity Providers.
  ### END INIT INFO
  #
  # Written by Quanah Gibson-Mount <quanah@stanford.edu>
@@@ -56,22 -56,23 +56,22 @@@ start
          exit 0
      fi
      echo -n "Starting $DESC: "
-     start-stop-daemon --background --start --quiet \
+     start-stop-daemon --start --quiet \
          --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
      echo "$NAME."
      ;;
  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)
      echo -n "Restarting $DESC: "
      start-stop-daemon --stop --quiet --pidfile $PIDFILE \
 -        --exec $DAEMON
 -    sleep 1
 -    start-stop-daemon --start --quiet \
 -        --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
 +        --retry TERM/30/KILL/5 --exec $DAEMON
-     start-stop-daemon --background --start --quiet \
-         --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
++    start-stop-daemon --start --quiet --pidfile $PIDFILE \
++        --exec $DAEMON -- $DAEMON_OPTS
      echo "$NAME."
      ;;
  *)