diff options
author | Adam Tkac <atkac@fedoraproject.org> | 2010-03-01 12:20:05 +0000 |
---|---|---|
committer | Adam Tkac <atkac@fedoraproject.org> | 2010-03-01 12:20:05 +0000 |
commit | 311ac6e9ab23a240dc0eb31429c02df6f6082d0c (patch) | |
tree | cb72d8cf8fd9b76aa646007488c40c59cb84739e | |
parent | 1f627ba683c2deb2cea54cb0a384c53d32ea88b9 (diff) | |
download | bind-311ac6e9ab23a240dc0eb31429c02df6f6082d0c.tar.gz bind-311ac6e9ab23a240dc0eb31429c02df6f6082d0c.tar.xz bind-311ac6e9ab23a240dc0eb31429c02df6f6082d0c.zip |
- improve automatic DNSSEC reconfiguration trigger
- initscript now returns 2 in case that action doesn't exist (#523435)
-rw-r--r-- | bind.spec | 11 | ||||
-rwxr-xr-x | named.init | 2 |
2 files changed, 11 insertions, 2 deletions
@@ -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 @@ -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 |