projects
/
shibboleth
/
sp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.3+dfsg
[shibboleth/sp.git]
/
configs
/
shibd-redhat.in
diff --git
a/configs/shibd-redhat.in
b/configs/shibd-redhat.in
index
02e3426
..
fd80ee5
100644
(file)
--- a/
configs/shibd-redhat.in
+++ b/
configs/shibd-redhat.in
@@
-14,6
+14,7
@@
shibd="@-PREFIX-@/sbin/shibd"
SHIBD_USER=root
pidfile=@-PKGRUNDIR-@/shibd.pid
prog=shibd
SHIBD_USER=root
pidfile=@-PKGRUNDIR-@/shibd.pid
prog=shibd
+VER=`cat /etc/redhat-release | awk '{print $3}' | awk -F . '{print $1}'`
RETVAL=0
start() {
RETVAL=0
start() {
@@
-24,7
+25,7
@@
start() {
if checkpid $kpid 2>&1; then
echo "process already running"
return -1
if checkpid $kpid 2>&1; then
echo "process already running"
return -1
- else
+
else
echo "lock file found but no process running for pid $kpid, continuing"
fi
fi
echo "lock file found but no process running for pid $kpid, continuing"
fi
fi
@@
-36,7
+37,11
@@
start() {
if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
/sbin/restorecon $pidfile
fi
if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
/sbin/restorecon $pidfile
fi
- daemon --user $SHIBD_USER --pidfile $pidfile $shibd -p $pidfile -f -w 3
+ 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
RETVAL=$?
echo
RETVAL=$?
echo
@@
-46,10
+51,10
@@
start() {
stop() {
echo -n $"Stopping $prog: "
stop() {
echo -n $"Stopping $prog: "
- if [ -f $pidfile
]
; then
+ if [ -f $pidfile
-a 5 -le $VER ]
; then
killproc -p $pidfile shibd
else
killproc -p $pidfile shibd
else
- killproc shibd
+
killproc shibd
fi
RETVAL=$?
fi
RETVAL=$?
@@
-66,7
+71,7
@@
case "$1" in
stop
;;
status)
stop
;;
status)
-
status $shibd
+ status $shibd
RETVAL=$?
;;
restart)
RETVAL=$?
;;
restart)