diff --git a/bind.spec b/bind.spec index 923fe57..4faf105 100644 --- a/bind.spec +++ b/bind.spec @@ -20,7 +20,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv 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 32:9.7.0-0.12.rc1 +- initscript LSB related fixes (#523435) + * Wed Jan 27 2010 Adam Tkac 32:9.7.0-0.11.rc1 - revert the "DEBUG" feature (#510283), it causes too many problems (#545128) diff --git a/named.init b/named.init index 5694427..0394900 100755 --- a/named.init +++ b/named.init @@ -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