Changes and release notes for [#2603]

(cherry picked from commit 7663c17f3b3d2b1600a6864bec90bb045763a96a)

diff --git a/CHANGES b/CHANGES
index 76084a9ab1b18afab080a079529362756e1e4d57..779a7c81fb7dc84ae2bc3ac0cd72f56296500547 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5636.  [bug]           Check that zone files for 'dnssec-policy' zones are
+                       only referenced once in 'named.conf'. [GL #2603]
+
 5635.  [bug]           Journal compaction could fail when a journal with
                        invalid transaction headers was not detected at
                        startup.  [GL #2670]
@@ -37,7 +40,7 @@
 5619.  [protocol]      Implement draft-vandijk-dnsop-nsec-ttl, updating the
                        protocol such that NSEC(3) TTL values are set to the
                        minimum of the SOA MINIMUM value and the SOA TTL.
-                       [GL #2347].
+                       [GL #2347]
 
 5618.  [bug]           When introducing change 5149, "rndc dumpdb" started
                        to print a line above a stale RRset, indicating how

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index f172bd7ec5b2f7d166e8acaf0dad6bf8cd13dc79..dd49f585059d57299924234d069c6b39e39b6d30 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -77,3 +77,6 @@ Bug Fixes
 
 - Journal compaction could fail when a journal with invalid transaction 
   headers was not detected at startup. :gl:`#2670`
+
+- ``named-checkconf`` now complains if zones with ``dnssec-policy`` reference
+  the same zone file more than once. :gl:`#2603`