From: Ondřej Surý <ondrej@isc.org>
Date: Thu, 13 Jan 2022 08:48:38 +0000 (+0100)
Subject: Update CHANGES and release notes for [GL #3079]
X-Git-Tag: v9.18.0~24^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86b9df1dd23e2e8e582238f783548555e35f4d58;p=thirdparty%2Fbind9.git

Update CHANGES and release notes for [GL #3079]
---

diff --git a/CHANGES b/CHANGES
index 36e492efa48..892fc817f6d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,10 @@
-5790.	[bug]		Enforce enqueuing TCP resumeread to prevent the
-			next read callback from being executed before the
-			current read callback has finished, and the worker
-			receive buffer has been marked as "freed". [GL #3079]
+5790.	[bug]		The control channel was incorrectly looking for
+			ISC_R_CANCELED as a signal that the named is
+			shutting down.  In the dispatch refactoring,
+			the result code returned from network manager
+			is now ISC_R_SHUTTINGDOWN.  Change the control
+			channel code to use ISC_R_SHUTTINGDOWN result
+			code to detect named being shut down. [GL #3079]
 
 5789.	[bug]		Allow replacing expired zone signatures with
 			signatures created by the KSK. [GL #3049]
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index abb1d94d86e..ebaf3ebeda4 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -55,6 +55,5 @@ Bug Fixes
   after ``named`` restart in case the unsigned zone file gets modified
   while ``named`` is not running. This has been fixed. :gl:`#3071`
 
-- Under certain circumstances, reading from the raw TCP channels used
-  for rndc and statistics could cause assertion failure.  This has been
-  fixed. :gl:`#3079`
+- Using ``rndc`` on a busy recursive server could cause the ``named`` to abort
+  with assertion failure.  This has been fixed. :gl:`#3079`