From 311ac6e9ab23a240dc0eb31429c02df6f6082d0c Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@fedoraproject.org>
Date: Mon, 1 Mar 2010 12:20:05 +0000
Subject: [PATCH] - improve automatic DNSSEC reconfiguration trigger -
 initscript now returns 2 in case that action doesn't exist (#523435)

---
 bind.spec  | 11 ++++++++++-
 named.init |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bind.spec b/bind.spec
index ae5334f..d83d7c6 100644
--- a/bind.spec
+++ b/bind.spec
@@ -21,7 +21,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  ISC
 Version:  9.7.0
-Release:  1%{?dist}
+Release:  2%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -446,6 +446,11 @@ fi
 [ -r '/etc/named.conf' ] || exit 0
 cp -fp /etc/named.conf /etc/named.conf.rpmsave
 if grep -Eq '/etc/(named.dnssec.keys|pki/dnssec-keys)' /etc/named.conf; then
+  if grep -q 'dlv.isc.org.conf' /etc/named.conf; then
+    # DLV is configured, reconfigure it to new configuration
+    sed -i -e 's/.*dnssec-lookaside.*dlv\.isc\.org\..*/dnssec-lookaside auto;\
+bindkeys-file "\/etc\/named.iscdlv.key;"/;' /etc/named.conf
+  fi
   sed -i -e '/.*named\.dnssec\.keys.*/d' -e '/.*pki\/dnssec-keys.*/d' \
     /etc/named.conf
 fi
@@ -624,6 +629,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Mon Mar 01 2010 Adam Tkac <atkac redhat com> 32:9.7.0-2
+- improve automatic DNSSEC reconfiguration trigger
+- initscript now returns 2 in case that action doesn't exist (#523435)
+
 * Wed Feb 17 2010 Adam Tkac <atkac redhat com> 32:9.7.0-1
 - update to 9.7.0 final
 
diff --git a/named.init b/named.init
index ce5c745..1fe5dbd 100755
--- a/named.init
+++ b/named.init
@@ -263,7 +263,7 @@ case "$1" in
 	*)
         	echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
 		[ "x$1" = "x" ] && exit 0
-		exit 3
+		exit 2
 esac
 
 exit $RETVAL