rpms/bind/devel bind.spec,1.336,1.337 named.init,1.76,1.77

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32750

Modified Files:
	bind.spec named.init 
Log Message:
- initscript LSB related fixes (#523435)



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -p -r1.336 -r1.337
--- bind.spec	27 Jan 2010 15:19:02 -0000	1.336
+++ bind.spec	27 Jan 2010 17:12:18 -0000	1.337
@@ -20,7 +20,7 @@ Summary:  The Berkeley Internet Name Dom
 Name:     bind
 License:  ISC
 Version:  9.7.0
-Release:  0.11.%{PREVER}%{?dist}
+Release:  0.12.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -621,6 +621,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Wed Jan 27 2010 Adam Tkac <atkac redhat com> 32:9.7.0-0.12.rc1
+- initscript LSB related fixes (#523435)
+
 * Wed Jan 27 2010 Adam Tkac <atkac redhat com> 32:9.7.0-0.11.rc1
 - revert the "DEBUG" feature (#510283), it causes too many problems (#545128)
 


Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/named.init,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- named.init	27 Jan 2010 15:19:02 -0000	1.76
+++ named.init	27 Jan 2010 17:12:19 -0000	1.77
@@ -92,6 +92,8 @@ umount_chroot_conf()
 # Check if all what named needs running
 start()
 {
+  [ "$EUID" != "0" ] && exit 4
+
   # Source networking configuration.
   [ -r /etc/sysconfig/network ] && . /etc/sysconfig/network
 
@@ -123,9 +125,9 @@ start()
   echo -n $"Starting named: "
   if [ -n "`/sbin/pidof -o %PPID "$named"`" ]; then
     echo -n $"named: already running"
-    failure
+    success
     echo
-    exit 1;
+    exit 0;
   fi;
 
   ckcf_options='-z'; # enable named-checkzone for each zone (9.3.1+) !
@@ -175,6 +177,8 @@ start()
 }
 
 stop() {
+  [ "$EUID" != "0" ] && exit 4
+
   # Stop daemons.
   echo -n $"Stopping named: "
   [ -x /usr/sbin/rndc ] && /usr/sbin/rndc stop >/dev/null 2>&1;
@@ -223,6 +227,8 @@ restart() {
 	start
 }	
 reload() {
+        [ "$EUID" != "0" ] && exit 
+
         echo -n $"Reloading "$named": "
 	p=`/sbin/pidof -o %PPID "$named"`
 	RETVAL=$?
@@ -250,11 +256,7 @@ case "$1" in
 	restart)
 		restart
 		;;
-	condrestart)
-		echo "condrestart option is obsolete. Use try-restart instead"
-		if [ -e /var/lock/subsys/named ]; then restart; fi
-		;;
-	try-restart)
+	condrestart|try-restart)
 		if [ -e /var/lock/subsys/named ]; then restart; fi
                 ;;
 	reload)
@@ -265,6 +267,7 @@ case "$1" in
 		;;
 	*)
         	echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+		[ "x$1" = "x" ] && exit 0
 		exit 3
 esac