From: Evan Hunt <each@isc.org>
Date: Thu, 27 May 2021 00:41:11 +0000 (-0700)
Subject: CHANGES, release note
X-Git-Tag: v9.17.14~18^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8b793760c4a8dd260edfead31794c0a4ddfcb33;p=thirdparty%2Fbind9.git

CHANGES, release note
---

diff --git a/CHANGES b/CHANGES
index 16dc963a4df..143512c9bb0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+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]
+
 5648.	[bug]		The calculation of the estimated IXFR transaction
 			size by dns_journal_iter_init() was invalid. [GL #2685]
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 9039afa789a..24d0bdd01ab 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -61,3 +61,7 @@ Bug Fixes
 - The calculation of the estimated IXFR transaction size by
   `dns_journal_iter_init()` was invalid.  This resulted in excessive
   AXFR-style-IXFR responses. :gl:`#2685`
+
+- 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`