[bind] Fix "service named status" and don't check MD5, size and mtime of sysconfig/named.

[Adam Tkac]

commit 559263dd252badf8931e2bc8ab67ef44cabb6293
Author: Adam Tkac <atkac at redhat.com>
Date:   Thu Jan 6 15:12:00 2011 +0100

    Fix "service named status" and don't check MD5, size and mtime of sysconfig/named.
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 bind.spec  |    8 ++++++--
 named.init |   12 +++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/bind.spec b/bind.spec
index 53ee224..e297a42 100644
--- a/bind.spec
+++ b/bind.spec
@@ -22,7 +22,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  ISC
 Version:  9.7.3
-Release:  0.2.%{PREVER}%{?dist}
+Release:  0.3.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -605,7 +605,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %files
 %defattr(-,root,root,-)
 %{_libdir}/bind
-%config(noreplace) %{_sysconfdir}/sysconfig/named
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sysconfig/named
 %config(noreplace) %attr(-,root,named) %{_sysconfdir}/named.iscdlv.key
 %config(noreplace) %attr(-,root,named) %{_sysconfdir}/named.root.key
 %{_sysconfdir}/tmpfiles.d/named.conf
@@ -766,6 +766,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Thu Jan 06 2011 Adam Tkac <atkac redhat com> 32:9.7.3-0.3.b1
+- fix "service named status" when used with named-sdb
+- don't check MD5, size and mtime of sysconfig/named
+
 * Wed Jan 05 2011 Adam Tkac <atkac redhat com> 32:9.7.3-0.2.b1
 - add new option DISABLE_ZONE_CHECKING to sysconfig/named
 
diff --git a/named.init b/named.init
index d679a7a..90518e2 100755
--- a/named.init
+++ b/named.init
@@ -42,6 +42,8 @@ if [ -n "$ROOTDIR" ]; then
    fi;
 fi
 
+PIDFILE="/var/run/named/named.pid"
+
 ROOTDIR_MOUNT='/etc/named /etc/pki/dnssec-keys /var/named /etc/named.conf
 /etc/named.dnssec.keys /etc/named.rfc1912.zones /etc/rndc.conf /etc/rndc.key
 /usr/lib64/bind /usr/lib/bind /etc/named.iscdlv.key /etc/named.root.key'
@@ -85,7 +87,7 @@ umount_chroot_conf()
 }
 
 pidofnamed() {
-	pidofproc -p "$ROOTDIR/var/run/named/named.pid" "$named";
+	pidofproc -p "$ROOTDIR/$PIDFILE" "$named";
 }
 
 # Check if all what named needs running
@@ -143,11 +145,11 @@ start()
   # check if configuration is correct
   if [ -x /usr/sbin/named-checkconf ] && [ -x /usr/sbin/named-checkzone ] && /usr/sbin/named-checkconf $ckcf_options ${named_conf} >/dev/null 2>&1; then
 
-    daemon --pidfile "$ROOTDIR/var/run/named/named.pid" /usr/sbin/"$named" -u named ${OPTIONS};
+    daemon --pidfile "$ROOTDIR/$PIDFILE" /usr/sbin/"$named" -u named ${OPTIONS};
     RETVAL=$?
     if [ $RETVAL -eq 0 ]; then
       rm -f /var/run/{named,named-sdb}.pid;
-      ln -s $ROOTDIR/var/run/named/"$named".pid /var/run/"$named".pid;
+      ln -s $ROOTDIR/"$PIDFILE" /var/run/"$named".pid;
     fi;
 
   else
@@ -180,7 +182,7 @@ stop() {
   RETVAL=$?
   # was rndc successful?
   [ "$RETVAL" -eq 0 ] || \\
-    killproc -p "$ROOTDIR/var/run/named/named.pid" "$named" -TERM >/dev/null 2>&1
+    killproc -p "$ROOTDIR/$PIDFILE" "$named" -TERM >/dev/null 2>&1
 
   timeout=0
   RETVAL=0
@@ -215,7 +217,7 @@ stop() {
 
 rhstatus() {
   [ -x /usr/sbin/rndc ] && /usr/sbin/rndc status;
-  status /usr/sbin/"$named";
+  status -p "$ROOTDIR/$PIDFILE" /usr/sbin/"$named";
   return $?
 }	
 restart() {