From 41945b32d76c99e18c697d03ebc039091386667c Mon Sep 17 00:00:00 2001 From: Aram Sargsyan Date: Thu, 26 Oct 2023 12:28:25 +0000 Subject: [PATCH] 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. --- bin/named/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/named/server.c b/bin/named/server.c index a6b2c2be9b..15bcfa7ffa 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,