rpms/bind/FC-3 bind.spec,1.48,1.49 named.init,1.25,1.26

[fedora-cvs-commits at redhat.com]

Author: jvdias

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

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


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-3/bind.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- bind.spec	12 Jul 2005 22:14:33 -0000	1.48
+++ bind.spec	19 Jul 2005 15:53:11 -0000	1.49
@@ -8,7 +8,7 @@
 Name: bind
 License: BSD-like
 Version: 9.2.5
-Release: 2
+Release: 3
 Epoch:   24
 Url: http://www.isc.org/products/BIND/
 Buildroot: %{_tmppath}/%{name}-root
@@ -644,6 +644,9 @@
 :;
 
 %changelog
+* Tue Jul 19 2005 Jason Vas Dias <jvdias at redhat.com> - 24:9.2.5-3
+- fix named.init script bugs 163598, 163409, 151852(addendum)
+
 * Tue Jul 12 2005 Jason Vas Dias <jvdias at redhat.com> - 24.9.2.5-2
 - 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-3/named.init,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- named.init	13 Jul 2005 23:37:23 -0000	1.25
+++ named.init	19 Jul 2005 15:53:11 -0000	1.26
@@ -109,13 +109,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
@@ -145,7 +145,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"