From: Ondřej Surý <ondrej@isc.org>
Date: Thu, 26 Oct 2023 08:59:53 +0000 (+0200)
Subject: Add CHANGES and release note for [GL #4386]
X-Git-Tag: v9.19.18~19^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8294a43acfc2e796be8bee3e7e311162e6a4047d;p=thirdparty%2Fbind9.git

Add CHANGES and release note for [GL #4386]
---

diff --git a/CHANGES b/CHANGES
index 46bca3cfb2c..7ab6f6b1df6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6275.	[bug]		Fix assertion failure when using lock-file configuration
+			option together -X argument to named. [GL #4386]
+
 6274.	[bug]		The 'lock-file' file was being removed when it
 			shouldn't have been making it ineffective if named was
 			started 3 or more times. [GL #4387]
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 4bec73ae315..5fd0f69c05d 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -65,6 +65,9 @@ Bug Fixes
   have been making it ineffective if named was started 3 or more
   times. :gl:`#4387`
 
+- When :any:`lock-file` was used at the same time as :option:`named -X`, the
+  assertion failure would be triggered.  This has been fixed. :gl:`#4386`
+
 Known Issues
 ~~~~~~~~~~~~