From: Matthijs Mekking <matthijs@isc.org>
Date: Thu, 27 May 2021 14:04:07 +0000 (+0200)
Subject: Add CHANGES and notes for [#2733]
X-Git-Tag: v9.17.14~16^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ca253818ee30ba18302f602232a6a86e9861c5c;p=thirdparty%2Fbind9.git

Add CHANGES and notes for [#2733]
---

diff --git a/CHANGES b/CHANGES
index 143512c9bb0..2838b49b5b6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+5650.	[bug]		Prevent a crash that could occur if serve-stale
+			was enabled and a prefetch was triggered during a
+			query restart. [GL #2733]
+
 5649.	[bug]		If a query was answered with stale data on a server
 			with DNS64 enabled, an assertion could occur if a
 			non-stale answer arrived afterward. [GL #2731]
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 24d0bdd01ab..04f1e8db86e 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -65,3 +65,7 @@ Bug Fixes
 - If a query was answered with stale data on a server with DNS64 enabled,
   an assertion could occur if a non-stale answer arrived afterward. This
   has been fixed. :gl:`#2731`
+
+- Fixed an assertion failure that could occur if stale data was used
+  to answer a query, and then a prefetch was triggered after the query
+  was restarted (for example, to follow a CNAME). :gl:`#2733`