From: Evan Hunt <each@isc.org>
Date: Mon, 11 Jul 2022 20:48:21 +0000 (-0700)
Subject: CHANGES and release note for [GL #2918]
X-Git-Tag: v9.19.4~17^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c3fdecd73f3c5f76b98c4d8db7a2758c1dd21e6;p=thirdparty%2Fbind9.git

CHANGES and release note for [GL #2918]
---

diff --git a/CHANGES b/CHANGES
index 829500559e9..3beb7165471 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+5929.	[func]		The use of the "max-zone-ttl" option in "zone" and
+			"options" blocks is now deprecated; this should
+			now be configured as part of "dnssec-policy"
+			instead. The old option still works in zones
+			with no "dnssec-policy" configured, but a warning
+			will be logged when loading configuration. Its
+			functionality will be removed in a future release.
+			Using "max-zone-ttl" and "dnssec-policy" in the
+			same zone is now a fatal error. [GL #2918]
+
 5928.	[placeholder]
 
 5927.	[bug]		A race was possible in dns_dispatch_connect()
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index b604010fcc0..acbec4e529c 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -32,6 +32,12 @@ Removed Features
 
 - None.
 
+- The use of the ``max-zone-ttl`` option in ``options`` and ``zone``
+  blocks has been deprecated; it should now be configured as part of
+  ``dnssec-policy``. A warning is logged if this option is used in
+  ``options`` or ``zone``. In a future release, it will become
+  nonoperational. :gl:`#2918`
+
 Feature Changes
 ~~~~~~~~~~~~~~~