rpms/bind/devel named.init,1.29,1.30

[fedora-cvs-commits redhat com]

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20264

Modified Files:
	named.init 
Log Message:
fix bugs 163598, 163409


Index: named.init
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/named.init,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- named.init	13 Jul 2005 23:30:53 -0000	1.29
+++ named.init	19 Jul 2005 15:40:15 -0000	1.30
@@ -92,6 +92,7 @@
 	   daemon /usr/sbin/$PROG -u named ${OPTIONS};
 	   RETVAL=$?;
 	   if [ $RETVAL -eq 0 ]; then
+	       rm -f /var/run/named.pid
 	       ln -s $ROOTDIR/var/run/named/named.pid /var/run/named.pid;
 	   fi;
 	else
@@ -113,13 +114,13 @@
 stop() {
         # Stop daemons.
         echo -n $"Stopping $prog: "
-	/usr/sbin/rndc stop >/dev/null 2>&1 || pidof named >/dev/null && killproc named -TERM >/dev/null 2>&1
+	/usr/sbin/rndc stop >/dev/null 2>&1 
 	RETVAL=$?
 	if [ $RETVAL -eq 0 ]; then
 	    rm -f /var/lock/subsys/named
 	    rm -f /var/run/named.pid	    
-	elif  pidof named >/dev/null; then
-	    /usr/sbin/rndc stop >/dev/null 2>&1 || pidof named >/dev/null && killproc named -TERM >/dev/null 2>&1
+	elif pidof named >/dev/null; then
+	    killproc named -TERM >/dev/null 2>&1
 	    RETVAL=$?
 	    if [ $RETVAL -eq 0 ]; then
 		rm -f /var/lock/subsys/named
@@ -150,7 +151,7 @@
 	p=`/sbin/pidof -o %PPID named`	
 	RETVAL=$?
 	if [ "$RETVAL" -eq 0 ]; then 
-	    /usr/sbin/rndc reload >/dev/null 2>&1 || /usr/bin/kill -HUP $p;
+	    /usr/sbin/rndc reload >/dev/null 2>&1 || /bin/kill -HUP $p;
 	    RETVAL=$?
         fi
 	[ "$RETVAL" -eq 0 ] && success $"$prog reload" || failure $"$prog reload"