From: Michał Kępień <michal@isc.org>
Date: Mon, 19 Apr 2021 13:05:11 +0000 (+0200)
Subject: Tweak and reword recent CHANGES entries
X-Git-Tag: v9.16.16~20^2~3^2~2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=109f840ba21bacc1bd8177405a6676dcc68715d5;p=thirdparty%2Fbind9.git

Tweak and reword recent CHANGES entries
---

diff --git a/CHANGES b/CHANGES
index 52613b8b1df..4ef7d2c6072 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,16 +15,6 @@
 5622.	[cleanup]	Remove lib/samples, since export versions of libraries
 			are no longer maintained. [GL !4835]
 
-5621.	[bug]		Due to a backporting mistake in change 5609, named
-			binaries built against a Kerberos/GSSAPI library whose
-			header files did not define the GSS_SPNEGO_MECHANISM
-			preprocessor macro were not able to start if their
-			configuration included the "tkey-gssapi-credential"
-			option. This has been fixed. [GL #2634]
-
-5620.	[bug]		Named would overwrite a zone file unconditionally when
-			it recovered from a corrupted journal. [GL #2623]
-
 5619.	[protocol]	Implement draft-vandijk-dnsop-nsec-ttl, updating the
 			protocol such that NSEC(3) TTL values are set to the
 			minimum of the SOA MINIMUM value and the SOA TTL.
@@ -37,6 +27,21 @@
 			nonsensical values and both issues have been fixed.
 			[GL #389] [GL #2289]
 
+5621.	[bug]		Due to a backporting mistake in change 5609, named
+			binaries built against a Kerberos/GSSAPI library whose
+			header files did not define the GSS_SPNEGO_MECHANISM
+			preprocessor macro were not able to start if their
+			configuration included the "tkey-gssapi-credential"
+			option. This has been fixed. [GL #2634]
+
+5620.	[bug]		If zone journal files written by BIND 9.16.11 or earlier
+			were present when BIND was upgraded, the zone file for
+			that zone could have been inadvertently rewritten with
+			the current zone contents. This caused the original zone
+			file structure (e.g. comments, $INCLUDE directives) to
+			be lost, although the zone data itself was preserved.
+			This has been fixed. [GL #2623]
+
 	--- 9.16.14 released ---
 
 5617.	[security]	A specially crafted GSS-TSIG query could cause a buffer