From: Aram Sargsyan <aram@isc.org>
Date: Thu, 26 Oct 2023 12:28:25 +0000 (+0000)
Subject: Do not warn about lock-file option change when -X is used
X-Git-Tag: v9.19.18~18^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41945b32d76c99e18c697d03ebc039091386667c;p=thirdparty%2Fbind9.git

Do not warn about lock-file option change when -X is used

When -X is used the 'lock-file' option change detection condition
is invalid, because it compares the 'lock-file' option's value to
the '-X' argument's value instead of the older 'lock-file' option
value (which was ignored because of '-X').

Don't warn about changing 'lock-file' option if '-X' is used.
---

diff --git a/bin/named/server.c b/bin/named/server.c
index a6b2c2be9b1..15bcfa7ffa2 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -8152,7 +8152,7 @@ check_lockfile(named_server_t *server, const cfg_obj_t *config,
 
 	if (!first_time) {
 		if (obj != NULL && cfg_obj_isstring(obj) &&
-		    server->lockfile != NULL &&
+		    server->lockfile != NULL && !named_g_forcelock &&
 		    strcmp(cfg_obj_asstring(obj), server->lockfile) != 0)
 		{
 			isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,