From: Scott Cantor <cantor.2@osu.edu>
Date: Wed, 4 Nov 2009 15:23:32 +0000 (+0000)
Subject: https://issues.shibboleth.net/jira/browse/SSPCPP-258
X-Git-Tag: 2.3.1~17
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=8f8f156368e049af530a7b1d1ec6aa9ee35a65c3;hp=ce7abd70f1a7b6d8bf02ff4a23f2e57f2b18fff7;p=shibboleth%2Fcpp-sp.git

https://issues.shibboleth.net/jira/browse/SSPCPP-258
---

diff --git a/configs/shibd-redhat.in b/configs/shibd-redhat.in
index fd80ee5..a526cbd 100644
--- a/configs/shibd-redhat.in
+++ b/configs/shibd-redhat.in
@@ -14,7 +14,7 @@ shibd="@-PREFIX-@/sbin/shibd"
 SHIBD_USER=root
 pidfile=@-PKGRUNDIR-@/shibd.pid
 prog=shibd
-VER=`cat /etc/redhat-release | awk '{print $3}' | awk -F . '{print $1}'`
+#VER=`cat /etc/redhat-release | awk '{print $3}' | awk -F . '{print $1}'`
 RETVAL=0
 
 start() {
@@ -37,11 +37,7 @@ start() {
 	if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
 		/sbin/restorecon $pidfile
 	fi
-	if [ 5 -le $VER ] ; then
-		daemon --user $SHIBD_USER --pidfile $pidfile $shibd -p $pidfile -f -w 30
-	else
-		daemon --user $SHIBD_USER $shibd -p $pidfile -f -w 30
-	fi
+	daemon --user $SHIBD_USER $shibd -p $pidfile -f -w 30
 
 	RETVAL=$?
 	echo
@@ -51,11 +47,7 @@ start() {
 
 stop() {
 	echo -n $"Stopping $prog: "
-	if [ -f $pidfile -a 5 -le $VER ] ; then
-		killproc -p $pidfile shibd
-	else
-		killproc shibd
-	fi
+	killproc shibd
 
 	RETVAL=$?
 	echo