[cpp-sp] 11/34: Merge branch 'debian'

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to annotated tag debian/2.3+dfsg-1
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=03362422ca718405bc6ea12df57c74ae63010b50

commit 03362422ca718405bc6ea12df57c74ae63010b50
Merge: 317bfa4 86b8a8e
Author: Russ Allbery <rra at debian.org>
AuthorDate: Tue Nov 10 15:45:09 2009 -0800

    Merge branch 'debian'
    
    Conflicts:
    	configs/shibd-debian.in

 configs/shibd-debian.in                   | 35 ++++++++++++++++++++++++-------
 debian/changelog                          | 27 ++++++++++++++++++++++++
 debian/control                            |  2 +-
 debian/libapache2-mod-shib2.README.Debian |  4 ++--
 debian/libapache2-mod-shib2.postinst      |  6 ++++++
 debian/watch                              |  2 +-
 6 files changed, 65 insertions(+), 11 deletions(-)

diff --cc configs/shibd-debian.in
index d8d05f5,6404233..870afaa
--- a/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@@ -78,9 -99,10 +99,9 @@@ restart|force-reload
  
      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 --pidfile $PIDFILE \
-         --exec $DAEMON -- $DAEMON_OPTS
+     start-stop-daemon --start --quiet ${DAEMON_USER:+--chuid $DAEMON_USER} \
 -        --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
++        -- pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
      echo "$NAME."
      ;;
  *)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.