From: Matthijs Mekking <matthijs@isc.org>
Date: Tue, 4 May 2021 14:43:40 +0000 (+0200)
Subject: Release notes and changes for [GL #2463]
X-Git-Tag: v9.17.14~46^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9f4b074c43ae6d67d2081fb3de511ca0518dcb0;p=thirdparty%2Fbind9.git

Release notes and changes for [GL #2463]

Mention the bugfix.
---

diff --git a/CHANGES b/CHANGES
index b0c5f899b87..ad32dc08f68 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+5642.	[bug]		Check "key-directory" conflicts in "named.conf" for
+			zones in multiple views with different "dnssec-policy".
+			[GL #2463].
+
 5641.	[bug]		Address potential memory leak in dst_key_fromnamedfile.
 			[GL #2689]
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index c4da0ed151c..a1272fb24a0 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -98,3 +98,7 @@ Bug Fixes
 
 - ``named-checkconf`` now complains if zones with ``dnssec-policy`` reference
   the same zone file more than once. :gl:`#2603`
+
+- Check ``key-directory`` conflicts in ``named.conf`` for zones in multiple
+  views with different ``dnssec-policy``. Using the same ``key-directory`` for
+  such zones is not allowed. :gl:`#2463`