From: Matthijs Mekking <matthijs@isc.org>
Date: Fri, 18 Jun 2021 09:03:39 +0000 (+0200)
Subject: Add change and release note for [#2780]
X-Git-Tag: v9.17.16~13^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=d0668bd4cc4453b12a028e6dfd2101d0a0fdca35;p=thirdparty%2Fbind9.git

Add change and release note for [#2780]
---

diff --git a/CHANGES b/CHANGES
index ce23ac0fb11..8eff7be4974 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+5667.	[bug]		The configuration-checking code failed to account for
+			the inheritance rules of the "dnssec-policy" option.
+			[GL #2780]
+
 5666.	[func]		Tweak the safe "edns-udp-size" to match the probing
 			value from BIND 9.16 for better compatibility.
 			[GL #2183]
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 5528fc06b24..ddeb2d7fd76 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -59,3 +59,6 @@ Bug Fixes
 - A deadlock at startup was introduced when fixing :gl:`#1875` because when
   locking key files for reading and writing, "in-view" logic was not taken into
   account. This has been fixed. :gl:`#2783`
+
+- Checking of ``dnssec-policy`` was broken. The checks failed to account for
+  ``dnssec-policy`` inheritance. :gl:`#2780`