rpms/bind/FC-4 bind.spec,1.62,1.63 named.init,1.28,1.29

[fedora-cvs-commits at redhat.com]

Author: jvdias

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

Modified Files:
	bind.spec named.init 
Log Message:
fix bugs 163598, 163409, 151852(addendum)


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-4/bind.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- bind.spec	12 Jul 2005 22:04:25 -0000	1.62
+++ bind.spec	19 Jul 2005 15:46:33 -0000	1.63
@@ -9,7 +9,7 @@
 Name: bind
 License: BSD-like
 Version: 9.3.1
-Release: 6.FC4
+Release: 8.FC4
 Epoch:   24
 Url: http://www.isc.org/products/BIND/
 Buildroot: %{_tmppath}/%{name}-root
@@ -667,6 +667,9 @@
 :;
 
 %changelog
+* Tue Jul 19 2005 Jason Vas Dias <jvdias at redhat.com> - 24:9.3.1-8
+- fix named.init script bugs 163598, 163409, 151852(addendum)
+
 * Tue May 31 2005 Jason Vas Dias <jvdias at redhat.com> - 24:9.3.1-6.FC4
 - fix bug 157950: dig / host / nslookup should reject invalid resolv.conf
                   files and not use uninitialized garbage nameserver values


Index: named.init
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-4/named.init,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- named.init	18 May 2005 02:27:03 -0000	1.28
+++ named.init	19 Jul 2005 15:46:33 -0000	1.29
@@ -46,7 +46,7 @@
 		    mkdir -p ${ROOTDIR}/proc
 		fi
 		if ! egrep -q "${ROOTDIR}/proc proc" /etc/mtab; then
-		    mount -tproc none ${ROOTDIR}/proc 
+		    mount -tproc none ${ROOTDIR}/proc >/dev/null 2>&1 
 		fi
 	fi
 	no_write_master_zones=0
@@ -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"