From 823a6d91847d5fe87bae58836b0a69b621c0d3b6 Mon Sep 17 00:00:00 2001
From: Paul Wouters <paul@xelerance.com>
Date: Mar 09 2011 21:15:06 +0000
Subject: * Wed Mar 09 2011 Paul Wouters <paul@xelerance.com> - 3.2.7-4

- Fix misnamed variable NSD_AUTORELOAD which should be NSD_AUTOREBUILD
- Fix for init script properly returning OK/Failed (bz#535107) by Noa Resare
- Add ghost directive to /var/run/nsd (bz#656642)
- Bump release for EVR

Conflicts:

	nsd.spec

---

diff --git a/nsd.init b/nsd.init
index 95bbafc..51eb143 100755
--- a/nsd.init
+++ b/nsd.init
@@ -48,10 +48,13 @@ start() {
   $NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>&1
   $NSD_PROG -c $NSD_CONF $OTHER_NSD_OPTS
   RETVAL=$?
-  echo
         if [ $RETVAL -eq 0 ]; then
            touch /var/lock/subsys/nsd;
+           success
+           echo
         else
+           failure
+           echo
            exit 7;
         fi
   return 0;
@@ -70,6 +73,9 @@ stop() {
      rm -f /var/lock/subsys/nsd
      # ensure notifies are sent at startup
      rm -f $NSD_XFRDFILE
+     success
+  else
+     failure
   fi
   echo
   return $RETVAL
@@ -99,7 +105,27 @@ case "$1" in
   status)
 	$NSDC_PROG -c $NSD_CONF running
 	;;
-  stats|reload|rebuild|running|update|notify)
+  reload)
+	echo -n $"Rebuilding zonfiles:"
+	$NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>&1
+        RETVAL=$?
+        if [ $RETVAL -eq 0 ] ; then
+            success
+        else
+            failure
+        fi
+	echo 
+	echo -n $"Reloading nsd:"
+	$NSDC_PROG -c $NSD_CONF reload
+        RETVAL=$?
+        if [ $RETVAL -eq 0 ] ; then
+            success
+        else
+            failure
+        fi
+	echo
+	;;
+  stats|rebuild|running|update|notify)
 	$NSDC_PROG -c $NSD_CONF $1 
 	;;
   *)
diff --git a/nsd.spec b/nsd.spec
index 4d62147..cb709db 100644
--- a/nsd.spec
+++ b/nsd.spec
@@ -1,7 +1,7 @@
 Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
 Version: 3.2.7
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -66,11 +66,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc contrib/nsd.zones2nsd.conf
 %dir %{_sysconfdir}/nsd/
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.conf
-#%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/nsd
 %attr(0755,root,root) %{_initrddir}/%{name}
 %{_sysconfdir}/cron.hourly/nsd
-%attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
+%ghost %attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
 %attr(0755,%{name},%{name}) %dir %{_localstatedir}/lib/%{name}
 %{_sbindir}/*
 %{_mandir}/*/*
@@ -97,8 +96,11 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
-* Wed Mar 09 2011 Paul Wouters <paul@xelerance.com> - 3.2.7-2
+* Wed Mar 09 2011 Paul Wouters <paul@xelerance.com> - 3.2.7-4
 - Fix misnamed variable NSD_AUTORELOAD which should be NSD_AUTOREBUILD
+- Fix for init script properly returning OK/Failed (bz#535107) by Noa Resare
+- Add ghost directive to /var/run/nsd (bz#656642)
+- Bump release for EVR
 
 * Thu Feb 03 2011 Paul Wouters <paul@xelerance.com> - 3.2.7-1
 - Updated to 3.2.7