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

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

diff --git a/CHANGES b/CHANGES
index 7ab6f6b1df6..2ad34ec4bf8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6276.	[cleanup]	Remove both lock-file configuration option and the
+			-X argument to named. [GL #4391]
+
 6275.	[bug]		Fix assertion failure when using lock-file configuration
 			option together -X argument to named. [GL #4386]
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 5fd0f69c05d..d3acabc1b49 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -43,6 +43,15 @@ Removed Features
   The support for control channel over Unix Domain Sockets has been
   non-functional since BIND 9.18
 
+- Support for specifying ``lock-file`` via configuration and via the
+  :option:`named -X` command line option has been removed. An external process
+  supervisor should be used instead.  :gl:`#4391`
+
+  Alternatively :program:`flock` can be used to achieve the same effect as the
+  removed configuration/argument:
+
+    flock -n -x <dir>/named.lock <path>/named <args>
+
 Feature Changes
 ~~~~~~~~~~~~~~~
 
@@ -61,13 +70,6 @@ Bug Fixes
   DNSSEC records, it was scheduled to be resigning. This unwanted behavior
   has been fixed. :gl:`#4350`
 
-- The :any:`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`
-
-- 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
 ~~~~~~~~~~~~