From: Matthijs Mekking <matthijs@isc.org>
Date: Tue, 7 Dec 2021 13:26:05 +0000 (+0100)
Subject: Add CHANGES and release note for GL #3049
X-Git-Tag: v9.17.22~7^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3e668d630b2b9de767f68af409119a7d1a8a51c;p=thirdparty%2Fbind9.git

Add CHANGES and release note for GL #3049

This is a bugfix worth mentioning.
---

diff --git a/CHANGES b/CHANGES
index 0e6b6307ba0..10c516fb0f2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5789.	[bug]		Allow replacing expired zone signatures with
+			signatures created by the KSK. [GL #3049]
+
 5788.	[bug]		An assertion could occur if a catalog zone event was
 			scheduled while the task manager was being shut
 			down. [GL #3074]
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 741b70453b1..cfecfd31230 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -41,6 +41,10 @@ Feature Changes
 Bug Fixes
 ~~~~~~~~~
 
+- If signatures created by the ZSK are expired, and the ZSK private key is offline,
+  allow the expired signatures to be replaced with signatures created by the KSK.
+  :gl:`#3049`
+
 - On FreeBSD, a TCP connection would leak a small amount of heap memory leading
   to out-of-memory problem in a long run. This has been fixed. :gl:`#3051`