From: Aram Sargsyan <aram@isc.org>
Date: Wed, 1 Mar 2023 13:45:03 +0000 (+0000)
Subject: Add CHANGES and release notes for [GL #3911]
X-Git-Tag: v9.16.39~5^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=b7809d07f891c80f31b8107f2fc1ade973921474;p=thirdparty%2Fbind9.git

Add CHANGES and release notes for [GL #3911]

(cherry picked from commit e1036253db90efbd17db0eef3b17e37d2db86176)
---

diff --git a/CHANGES b/CHANGES
index 1e11032ae85..8f6795ebe09 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+6119.	[bug]		Make sure to revert the reconfigured zones to the
+			previous version of the view, when the new view
+			reconfiguration fails during the configuration of
+			one of the configured zones. [GL #3911]
+
 6116.	[bug]		Fix error path cleanup issue in the dns_catz_new_zones()
 			function. [GL #3900]
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 883842717bf..31f3f1e841e 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -54,7 +54,9 @@ Feature Changes
 Bug Fixes
 ~~~~~~~~~
 
-- None.
+- :iscman:`named` could crash with an assertion failure when adding a new zone
+  into the configuration file for a name, which is already configured as a
+  member zone for a catalog zone. This has been fixed. :gl:`#3911`
 
 Known Issues
 ~~~~~~~~~~~~