[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, master, updated. debian/2.2.1+dfsg-2-34-g68b2910

[Russ Allbery]

The following commit has been merged in the master branch:
commit 68b291037f5f04ea0b0b27af5516284e52d9624d
Merge: c89ea1470e86a87dd34e2e711c7aadd3e4f854a2 c5241720aa256c79c0b420ea082fcaf03bc2b066
Author: Russ Allbery <rra at debian.org>
Date:   Wed Nov 11 14:40:00 2009 -0800

    Merge branch 'debian'

diff --combined configs/shibd-debian.in
index 9308652,75c2fa2..a3c224b
--- a/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@@ -56,15 -56,15 +56,15 @@@ prepare_environment () 
      # Ensure @-PKGRUNDIR-@ exists.  /var/run may be on a tmpfs file system.
      [ -d '@-PKGRUNDIR-@' ] || mkdir -p '@-PKGRUNDIR-@'
  
-     # If $DAEMON_USER is set, try to run _shibd as that user.  However,
+     # If $DAEMON_USER is set, try to run shibd as that user.  However,
      # versions of the Debian package prior to 2.3+dfsg-1 ran shibd as root,
      # and the local administrator may not have made the server's private key
-     # readable by _shibd.  We therefore test first by running shibd -t and
-     # looking for the error code indicating that the private key could not be
-     # read.  If we get that error, we fall back on running shibd as root.
+     # readable by $DAEMON_USER.  We therefore test first by running shibd -t
+     # and looking for the error code indicating that the private key could not
+     # be read.  If we get that error, we fall back on running shibd as root.
      if [ -n "$DAEMON_USER" ]; then
          DIAG=$(su -s $DAEMON $DAEMON_USER -- -t $DAEMON_OPTS 2>/dev/null)
-         if [ $? != 0 ] ; then
+         if [ $? = 0 ] ; then
              # openssl errstr 200100D (hex for 33558541) says:
              # error:0200100D:system library:fopen:Permission denied
              ERROR='ERROR OpenSSL : error code: 33558541 '
@@@ -99,7 -99,7 +99,7 @@@ 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)
@@@ -107,7 -107,8 +107,7 @@@
  
      echo -n "Restarting $DESC: "
      start-stop-daemon --stop --quiet --pidfile $PIDFILE \
 -        --exec $DAEMON
 -    sleep 1
 +        --retry TERM/30/KILL/5 --exec $DAEMON
      start-stop-daemon --start --quiet ${DAEMON_USER:+--chuid $DAEMON_USER} \
          --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
      echo "$NAME."

-- 
Debian packaging for the 2.0 Apache Shibboleth SP