Merge branch '4386-fix-assertion-failure-when-using--X-named-option' into 'main'

Fix assertion failure when using -X and lock-file in configuration

Closes #4386

See merge request isc-projects/bind9!8427

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]

bin/named/server.c

@@ -8187,10 +8187,7 @@ check_lockfile(named_server_t *server, const cfg_obj_t *config,
 		if (server->lockfile == NULL) {
 			return (ISC_R_NOMEMORY);
 		}
-	}
-
-	if (named_g_forcelock && named_g_defaultlockfile != NULL) {
-		INSIST(server->lockfile == NULL);
+	} else if (named_g_forcelock && named_g_defaultlockfile != NULL) {
 		server->lockfile = isc_mem_strdup(server->mctx,
 						  named_g_defaultlockfile);
 	}

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
 ~~~~~~~~~~~~