Switch back to daemon/killproc shell functions.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/branches/REL_2@3002 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/configs/shibd-redhat.in b/configs/shibd-redhat.in
index cafe481..c642e70 100644 (file)
--- a/configs/shibd-redhat.in
+++ b/configs/shibd-redhat.in
@@ -36,8 +36,7 @@ start() {
        if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
                /sbin/restorecon $pidfile
        fi
-       # daemon function just hangs, so I'm using su directly
-       su - $SHIBD_USER -c "$shibd -p $pidfile -f"
+       daemon --user $SHIBD_USER --pidfile $pidfile $shibd -p $pidfile -f
 
        RETVAL=$?
        echo
@@ -48,10 +47,9 @@ start() {
 stop() {
        echo -n $"Stopping $prog: "
        if [ -f $pidfile ]; then
-               read kpid < $pidfile
-               kill $kpid
+               killproc -p $pidfile shibd
        else
-           killproc shibd
+        killproc shibd
        fi
 
        RETVAL=$?