Merge branch '4391-remove-lock-file-and--X' into 'main'

Remove the lock-file configuration and -X argument to named

Closes #4391

See merge request isc-projects/bind9!8428

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]
 

bin/named/config.c

@@ -67,7 +67,6 @@ options {\n\
 	interface-interval 60;\n\
 	listen-on {any;};\n\
 	listen-on-v6 {any;};\n\
-#	lock-file \"" NAMED_LOCALSTATEDIR "/run/named/named.lock\";\n\
 	match-mapped-addresses no;\n\
 	max-ixfr-ratio 100%;\n\
 	max-rsa-exponent-size 0; /* no limit */\n\

bin/named/include/named/globals.h

@@ -118,11 +118,6 @@ EXTERN const char *named_g_logfile   INIT(NULL);
 EXTERN const char *named_g_defaultsessionkeyfile INIT(NAMED_LOCALSTATEDIR
 						      "/run/named/"
 						      "session.key");
-EXTERN const char *named_g_defaultlockfile INIT(NAMED_LOCALSTATEDIR "/run/"
-								    "named/"
-								    "named."
-								    "lock");
-EXTERN bool named_g_forcelock		   INIT(false);
 
 #if NAMED_RUN_PID_DIR
 EXTERN const char *named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/named/"

bin/named/include/named/os.h

@@ -56,9 +56,6 @@ named_os_openfile(const char *filename, mode_t mode, bool switch_user);
 void
 named_os_writepidfile(const char *filename, bool first_time);
 
-bool
-named_os_issingleton(const char *filename);
-
 void
 named_os_shutdown(void);
 

bin/named/include/named/server.h

@@ -103,8 +103,6 @@ struct named_server {
 
 	dns_dtenv_t *dtenv; /*%< Dnstap environment */
 
-	char *lockfile;
-
 	isc_tlsctx_cache_t *tlsctx_server_cache;
 	isc_tlsctx_cache_t *tlsctx_client_cache;
 

bin/named/main.c

@@ -312,7 +312,7 @@ usage(void) {
 			"[-p port] [-s]\n"
 			"             [-S sockets] [-t chrootdir] [-u "
 			"username] [-U listeners]\n"
-			"             [-X lockfile] [-m "
+			"             [-m "
 			"{usage|trace|record|size|mctx}]\n"
 			"             [-M fill|nofill]\n"
 			"usage: named [-v|-V|-C]\n");
@@ -671,7 +671,6 @@ printversion(bool verbose) {
 	printf("  rndc configuration:   %s\n", rndcconf);
 	printf("  nsupdate session key: %s\n", named_g_defaultsessionkeyfile);
 	printf("  named PID file:       %s\n", named_g_defaultpidfile);
-	printf("  named lock file:      %s\n", named_g_defaultlockfile);
 #if defined(HAVE_GEOIP2)
 #define RTC(x) RUNTIME_CHECK((x) == ISC_R_SUCCESS)
 	RTC(cfg_parser_create(mctx, named_g_lctx, &parser));
@@ -964,13 +963,8 @@ parse_command_line(int argc, char *argv[]) {
 			/* Obsolete. No longer in use. Ignore. */
 			break;
 		case 'X':
-			named_g_forcelock = true;
-			if (strcasecmp(isc_commandline_argument, "none") != 0) {
-				named_g_defaultlockfile =
-					isc_commandline_argument;
-			} else {
-				named_g_defaultlockfile = NULL;
-			}
+			/* Obsolete. No longer in use. Abort. */
+			named_main_earlyfatal("option '-X' has been removed");
 			break;
 		case 'F':
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L && OPENSSL_API_LEVEL >= 30000

bin/named/named.rst

@@ -21,7 +21,7 @@ named - Internet domain name server
 Synopsis
 ~~~~~~~~
 
-:program:`named` [ [**-4**] | [**-6**] ] [**-c** config-file] [**-C**] [**-d** debug-level] [**-D** string] [**-E** engine-name] [**-f**] [**-g**] [**-L** logfile] [**-M** option] [**-m** flag] [**-n** #cpus] [**-p** port] [**-s**] [**-t** directory] [**-U** #listeners] [**-u** user] [**-v**] [**-V**] [**-X** lock-file]
+:program:`named` [ [**-4**] | [**-6**] ] [**-c** config-file] [**-C**] [**-d** debug-level] [**-D** string] [**-E** engine-name] [**-f**] [**-g**] [**-L** logfile] [**-M** option] [**-m** flag] [**-n** #cpus] [**-p** port] [**-s**] [**-t** directory] [**-U** #listeners] [**-u** user] [**-v**] [**-V**] ]
 
 Description
 ~~~~~~~~~~~
@@ -198,10 +198,7 @@ Options
 
 .. option:: -X lock-file
 
-   This option acquires a lock on the specified file at runtime; this helps to
-   prevent duplicate :program:`named` instances from running simultaneously.
-   Use of this option overrides the ``lock-file`` option in
-   :iscman:`named.conf`. If set to ``none``, the lock file check is disabled.
+   This option has been removed and using it will cause a fatal error.
 
 Signals
 ~~~~~~~

bin/named/os.c

@@ -51,9 +51,7 @@
 #endif /* ifdef HAVE_LIBSCF */
 
 static char *pidfile = NULL;
-static char *lockfile = NULL;
 static int devnullfd = -1;
-static int singletonfd = -1;
 
 #ifndef ISC_FACILITY
 #define ISC_FACILITY LOG_DAEMON
@@ -705,26 +703,6 @@ cleanup_pidfile(void) {
 	pidfile = NULL;
 }
 
-static void
-cleanup_lockfile(bool unlink_lockfile) {
-	if (singletonfd != -1) {
-		close(singletonfd);
-		singletonfd = -1;
-	}
-
-	if (lockfile != NULL) {
-		if (unlink_lockfile) {
-			int n = unlink(lockfile);
-			if (n == -1 && errno != ENOENT) {
-				named_main_earlywarning("unlink '%s': failed",
-							lockfile);
-			}
-		}
-		free(lockfile);
-		lockfile = NULL;
-	}
-}
-
 /*
  * Ensure that a directory exists.
  * NOTE: This function overwrites the '/' characters in 'filename' with
@@ -908,68 +886,10 @@ named_os_writepidfile(const char *filename, bool first_time) {
 	(void)fclose(fh);
 }
 
-bool
-named_os_issingleton(const char *filename) {
-	char strbuf[ISC_STRERRORSIZE];
-	struct flock lock;
-
-	if (singletonfd != -1) {
-		return (true);
-	}
-
-	if (strcasecmp(filename, "none") == 0) {
-		return (true);
-	}
-
-	/*
-	 * Make the containing directory if it doesn't exist.
-	 */
-	lockfile = strdup(filename);
-	if (lockfile == NULL) {
-		strerror_r(errno, strbuf, sizeof(strbuf));
-		named_main_earlyfatal("couldn't allocate memory for '%s': %s",
-				      filename, strbuf);
-	} else {
-		int ret = mkdirpath(lockfile, named_main_earlywarning);
-		if (ret == -1) {
-			named_main_earlywarning("couldn't create '%s'",
-						filename);
-			cleanup_lockfile(false);
-			return (false);
-		}
-	}
-
-	/*
-	 * named_os_openfile() uses safeopen() which removes any existing
-	 * files. We can't use that here.
-	 */
-	singletonfd = open(filename, O_WRONLY | O_CREAT,
-			   S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-	if (singletonfd == -1) {
-		cleanup_lockfile(false);
-		return (false);
-	}
-
-	memset(&lock, 0, sizeof(lock));
-	lock.l_type = F_WRLCK;
-	lock.l_whence = SEEK_SET;
-	lock.l_start = 0;
-	lock.l_len = 1;
-
-	/* Non-blocking (does not wait for lock) */
-	if (fcntl(singletonfd, F_SETLK, &lock) == -1) {
-		cleanup_lockfile(false);
-		return (false);
-	}
-
-	return (true);
-}
-
 void
 named_os_shutdown(void) {
 	closelog();
 	cleanup_pidfile();
-	cleanup_lockfile(true);
 }
 
 void

bin/named/server.c

@@ -8128,83 +8128,6 @@ cleanup:
 
 #endif /* HAVE_LMDB */
 
-static isc_result_t
-check_lockfile(named_server_t *server, const cfg_obj_t *config,
-	       bool first_time) {
-	isc_result_t result;
-	const char *filename = NULL;
-	const cfg_obj_t *maps[3];
-	const cfg_obj_t *options;
-	const cfg_obj_t *obj;
-	int i;
-
-	i = 0;
-	options = NULL;
-	result = cfg_map_get(config, "options", &options);
-	if (result == ISC_R_SUCCESS) {
-		maps[i++] = options;
-	}
-	maps[i++] = named_g_defaults;
-	maps[i] = NULL;
-
-	obj = NULL;
-	(void)named_config_get(maps, "lock-file", &obj);
-
-	if (!first_time) {
-		if (obj != NULL && cfg_obj_isstring(obj) &&
-		    server->lockfile != NULL && !named_g_forcelock &&
-		    strcmp(cfg_obj_asstring(obj), server->lockfile) != 0)
-		{
-			isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
-				      NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING,
-				      "changing 'lock-file' "
-				      "has no effect until the "
-				      "server is restarted");
-		}
-
-		return (ISC_R_SUCCESS);
-	}
-
-	if (obj != NULL) {
-		if (named_g_forcelock) {
-			isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
-				      NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING,
-				      "'lock-file' has no effect "
-				      "because the server was run with -X");
-			if (named_g_defaultlockfile != NULL) {
-				server->lockfile = isc_mem_strdup(
-					server->mctx, named_g_defaultlockfile);
-			}
-		} else if (cfg_obj_isvoid(obj)) {
-			isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
-				      NAMED_LOGMODULE_SERVER, ISC_LOG_DEBUG(1),
-				      "skipping lock-file check");
-		} else if (cfg_obj_isstring(obj)) {
-			filename = cfg_obj_asstring(obj);
-			server->lockfile = isc_mem_strdup(server->mctx,
-							  filename);
-		}
-	} else if (named_g_forcelock && named_g_defaultlockfile != NULL) {
-		server->lockfile = isc_mem_strdup(server->mctx,
-						  named_g_defaultlockfile);
-	}
-
-	if (server->lockfile == NULL) {
-		return (ISC_R_SUCCESS);
-	}
-
-	if (named_os_issingleton(server->lockfile)) {
-		return (ISC_R_SUCCESS);
-	}
-
-	isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
-		      NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR,
-		      "could not lock %s; another named "
-		      "process may be running",
-		      server->lockfile);
-	return (ISC_R_FAILURE);
-}
-
 static isc_result_t
 load_configuration(const char *filename, named_server_t *server,
 		   bool first_time) {
@@ -8420,14 +8343,6 @@ load_configuration(const char *filename, named_server_t *server,
 		setstring(server, &server->bindkeysfile, NULL);
 	}
 
-	/*
-	 * Check the process lockfile.
-	 */
-	result = check_lockfile(server, config, first_time);
-	if (result != ISC_R_SUCCESS) {
-		goto cleanup_bindkeys_parser;
-	}
-
 #if defined(HAVE_GEOIP2)
 	/*
 	 * Release any previously opened GeoIP2 databases.
@@ -10214,9 +10129,6 @@ named_server_destroy(named_server_t **serverp) {
 	if (server->hostname != NULL) {
 		isc_mem_free(server->mctx, server->hostname);
 	}
-	if (server->lockfile != NULL) {
-		isc_mem_free(server->mctx, server->lockfile);
-	}
 
 	if (server->zonemgr != NULL) {
 		dns_zonemgr_detach(&server->zonemgr);

bin/tests/system/README

@@ -566,7 +566,7 @@ By default, start.pl starts a "named" server with the following options:
 
     -U 4            Uses four listeners.
 
-    -X named.lock   Acquires a lock on this file in the "nsN" directory, so
+      Acquires a lock on this file in the "nsN" directory, so
                     preventing multiple instances of this named running in this
                     directory (which could possibly interfere with the test).
 

bin/tests/system/acl/clean.sh

@@ -20,7 +20,6 @@ rm -f ns2/example.db ns2/tsigzone.db ns2/example.db.jnl
 rm -f */named.conf
 rm -f */named.memstats
 rm -f */named.run
-rm -f ns*/named.lock
 rm -f ns*/_default.nzf
 rm -f ns*/_default.nzd*
 rm -f ns*/managed-keys.bind* ns*/*.mkeys*

bin/tests/system/additional/clean.sh

@@ -19,5 +19,4 @@ rm -f dig.out.*
 rm -f */named.memstats
 rm -f */named.conf
 rm -f */named.run
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*

bin/tests/system/additional/ns1/named.args

@@ -1,2 +1,2 @@
 # this server runs named with only one worker thread
--m record -c named.conf -d 99 -D additional-ns1 -X named.lock -g -n 1 -T maxcachesize=2097152
+-m record -c named.conf -d 99 -D additional-ns1 -g -n 1 -T maxcachesize=2097152

bin/tests/system/addzone/clean.sh

@@ -28,7 +28,6 @@ rm -f ./ns2/inline.db.jbk
 rm -f ./ns2/inline.db.signed
 rm -f ./ns2/inlinesec.bk*
 rm -rf ./ns2/new-zones
-rm -f ./ns*/named.lock
 rm -f ./ns*/named.run ./ns*/named.run.prev
 rm -f ./ns2/nzf-*
 rm -f ./ns3/named.conf

bin/tests/system/allow-query/clean.sh

@@ -19,6 +19,5 @@ rm -f dig.out.*
 rm -f ns*/named.conf
 rm -f ns2/controls.conf
 rm -f */named.memstats
-rm -f ns*/named.lock
 rm -f ns*/named.run ns*/named.run.prev
 rm -f ns*/managed-keys.bind* ns*/*.mkeys*

bin/tests/system/allow-query/ns3/named.args

@@ -1,2 +1,2 @@
 # this server only has 127.0.0.1 in its localhost/localnets ACLs
--m record -c named.conf -d 99 -D allow-query-ns3 -X named.lock -g -T maxcachesize=2097152 -T fixedlocal
+-m record -c named.conf -d 99 -D allow-query-ns3 -g -T maxcachesize=2097152 -T fixedlocal

bin/tests/system/autosign/clean.sh

@@ -28,7 +28,6 @@ rm -f noksk-ksk.key nozsk-ksk.key nozsk-zsk.key inaczsk-zsk.key inaczsk-ksk.key
 rm -f nopriv.key vanishing.key del1.key del2.key
 rm -rf ns*/inactive
 rm -f ns*/managed-keys.bind*
-rm -f ns*/named.lock
 rm -f ns1/root.db ns1/root.db.1 ns1/root.db.2 ns1/root.db.3
 rm -f ns1/signing.out
 rm -f ns2/bar.db

bin/tests/system/builtin/clean.sh

@@ -16,5 +16,4 @@ rm -f ns?/named.memstats
 rm -f ns?/named.conf
 rm -f rndc.status.ns*
 rm -f dig.out.ns*
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*

bin/tests/system/cacheclean/clean.sh

@@ -23,5 +23,4 @@ rm -f */named.memstats
 rm -f */named.run
 rm -f */named.conf
 rm -f ns2/named_dump.db.*
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*

bin/tests/system/cacheclean/ns1/named.args

@@ -1 +1 @@
--m record -c named.conf -d 1 -D cacheclean-ns1 -X named.lock -g -T maxcachesize=2097152
+-m record -c named.conf -d 1 -D cacheclean-ns1 -g -T maxcachesize=2097152

bin/tests/system/cacheclean/ns2/named.args

@@ -1 +1 @@
--m record -c named.conf -d 3 -D cacheclean-ns2 -X named.lock -g -T maxcachesize=2097152
+-m record -c named.conf -d 3 -D cacheclean-ns2 -g -T maxcachesize=2097152

bin/tests/system/case/clean.sh

@@ -13,7 +13,6 @@
 
 rm -f dig.ns*.test*
 rm -f ns*/named.conf
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns1/dynamic.db

bin/tests/system/catz/clean.sh

@@ -18,7 +18,6 @@ rm -f ns*/*.nzd ns*/*.nzd-lock
 rm -f ns*/*.nzf
 rm -f ns*/managed-keys.bind*
 rm -f ns*/named.conf
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns*/named.run.prev

bin/tests/system/chain/clean.sh

@@ -13,6 +13,6 @@
 
 rm -f dig.out.* named*.pid
 rm -f ns*/named.conf
-rm -f */named.memstats */named.recursing */named.lock */named.run */ans.run
+rm -f */named.memstats */named.recursing */named.run */ans.run
 rm -f ns2/K* ns2/dsset-* ns2/*.db.signed
 rm -f ns*/managed-keys.bind*

bin/tests/system/checkconf/clean.sh

@@ -23,5 +23,4 @@ rm -f good-kasp.conf.in
 rm -f good-server-christmas-tree.conf
 rm -f good.conf good.conf.raw good.conf.out badzero.conf *.out
 rm -rf keys
-rm -f ns*/named.lock
 rm -rf test.keydir

bin/tests/system/checknames/clean.sh

@@ -23,5 +23,4 @@ rm -f ns5/*.update.db
 rm -f ns5/*.update.db.jnl
 rm -f */named.memstats
 rm -f */named.run
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*

bin/tests/system/checkzone/clean.sh

@@ -12,6 +12,5 @@
 # information regarding copyright ownership.
 
 rm -f test.* good1.db.raw named-compilezone
-rm -f ns*/named.lock
 rm -f zones/bad-tsig.db
 rm -f zones/zone1_*.txt

bin/tests/system/cookie/clean.sh

@@ -18,7 +18,6 @@ rm -f rndc.out.*
 rm -f ns1/named_dump.db*
 rm -f ns*/named.memstats
 rm -f ns*/named.run
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
 rm -f ns*/named.run.prev
 rm -f ans*/ans.run ans*/ans.log

bin/tests/system/database/clean.sh

@@ -13,5 +13,4 @@
 
 rm -f ns1/named.conf ns1/named.run ns1/named.memstats
 rm -f dig.out.*
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*

bin/tests/system/dialup/clean.sh

@@ -15,4 +15,3 @@ rm -f ns2/example.bk
 rm -f ns3/example.bk
 rm -f */named.memstats */named.run
 rm -f ns*/named.conf
-rm -f ns*/named.lock

bin/tests/system/digdelv/clean.sh

@@ -27,7 +27,6 @@ rm -f ./dig.out.nm.*
 rm -f ./dig.out.nn.*
 rm -f ./host.out.test*
 rm -f ./ns*/managed-keys.bind*
-rm -f ./ns*/named.lock
 rm -f ./ns*/K* ./ns*/keyid ./ns*/keydata
 rm -f ./ns1/root.db
 rm -f ./ns*/dsset-*

bin/tests/system/dlzexternal/clean.sh

@@ -21,6 +21,5 @@ rm -f */named.conf
 rm -f */named.run
 rm -f ns1/ddns.key
 rm -f dig.out*
-rm -f ns*/named.lock
 rm -f ns1/session.key
 rm -f ns*/managed-keys.bind*

bin/tests/system/dns64/clean.sh

@@ -18,5 +18,4 @@ rm -f ns1/dsset-signed.
 rm -f */named.memstats
 rm -f */named.run
 rm -f dig.out.*
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*

bin/tests/system/dnssec/clean.sh

@@ -33,7 +33,6 @@ rm -f ./keygen.err
 rm -f ./named.secroots.test*
 rm -f ./ns*/*.nta
 rm -f ./ns*/managed-keys.bind ./ns*/managed-keys.bind.jnl ./ns*/*.mkeys*
-rm -f ./ns*/named.lock
 rm -f ./ns1/managed.key.id
 rm -f ./ns1/root.db ./ns2/example.db ./ns2/managed.db ./ns2/trusted.db
 rm -f ./ns1/trusted.keys

bin/tests/system/dnssec/ns6/named.args

@@ -1 +1 @@
--m record -c named.conf -d 99 -D dnssec-ns6 -X named.lock -g -T maxcachesize=2097152 -T nonearest -T tat=1
+-m record -c named.conf -d 99 -D dnssec-ns6 -g -T maxcachesize=2097152 -T nonearest -T tat=1

bin/tests/system/dnstap/clean.sh

@@ -23,7 +23,6 @@ rm -f ns*/dnstap.out
 rm -f ns*/dnstap.out.save
 rm -f ns*/dnstap.out.save.?
 rm -f ns*/managed-keys.bind*
-rm -f ns*/named.lock
 rm -f ns2/dnstap.out.*
 rm -f ns2/example.db ns2/example.db.jnl
 rm -f ns3/dnstap.out.*

bin/tests/system/dnstap/ns3/named.args

@@ -1,2 +1,2 @@
 # Using "-n 1" allows GL #1795 to be reliably reproduced
--D dnstap-ns3 -X named.lock -m record -c named.conf -d 99 -g -U 4 -n 1 -T maxcachesize=2097152
+-D dnstap-ns3 -m record -c named.conf -d 99 -g -U 4 -n 1 -T maxcachesize=2097152

bin/tests/system/dsdigest/clean.sh

@@ -20,5 +20,4 @@ rm -f dig.out*
 rm -f */named.conf
 rm -f */named.run
 rm -f */named.memstats
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*

bin/tests/system/ecdsa/clean.sh

@@ -19,7 +19,6 @@ rm -f ns*/K*
 rm -f ns*/dsset-*
 rm -f ns*/managed-keys.bind*
 rm -f ns*/named.conf
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns*/root.db

bin/tests/system/eddsa/clean.sh

@@ -19,7 +19,6 @@ rm -f ns*/K*
 rm -f ns*/dsset-*
 rm -f ns*/managed-keys.bind*
 rm -f ns*/named.conf
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns*/root.db

bin/tests/system/ednscompliance/clean.sh

@@ -12,7 +12,6 @@
 # information regarding copyright ownership.
 
 rm -f dig.out*
-rm -f ns*/named.lock
 rm -f ns*/named.conf
 rm -f ns*/named.run
 rm -f ns*/named.memstats

bin/tests/system/emptyzones/clean.sh

@@ -12,7 +12,6 @@
 # information regarding copyright ownership.
 
 rm -f ns1/named.conf
-rm -f ns*/named.lock
 rm -f ns*/named.run
 rm -f ns*/named.memstats
 rm -f dig.out.test*

bin/tests/system/enginepkcs11/ns1/named.args.in

@@ -1 +1 @@
-@ENGINE_ARGS@ -D enginepkcs11-ns1 -X named.lock -m record -c named.conf -d 99 -U 4 -T maxcachesize=2097152
+@ENGINE_ARGS@ -D enginepkcs11-ns1 -m record -c named.conf -d 99 -U 4 -T maxcachesize=2097152

bin/tests/system/fetchlimit/ns3/named.args

@@ -1 +1 @@
--m record -c named.conf -d 1 -D fetchlimit-ns3 -X named.lock -g -T maxcachesize=2097152
+-m record -c named.conf -d 1 -D fetchlimit-ns3 -g -T maxcachesize=2097152

bin/tests/system/filter-aaaa/clean.sh

@@ -26,7 +26,6 @@ rm -f ns4/signer.err
 rm -f ns4/dsset-*
 
 rm -f dig.out.*
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*
 
 rm -f ns*/trusted.conf

bin/tests/system/formerr/clean.sh

@@ -15,7 +15,6 @@ rm -f nametoolong.out
 rm -f twoquestions.out
 rm -f noquestions.out
 rm -f ns*/named.conf
-rm -f ns*/named.lock
 rm -f ns*/named.run
 rm -f ns*/named.memstats
 rm -f ns*/managed-keys.bind*

bin/tests/system/forward/clean.sh

@@ -21,7 +21,6 @@ rm -f ./*/named_dump.db
 rm -f ./ans*/query.log
 rm -f ./dig.out.*
 rm -f ./ns*/managed-keys.bind*
-rm -f ./ns*/named.lock
 rm -f ./ns*/trusted.conf
 rm -f ./ns1/K* ./ns1/dsset-*
 rm -f ./ns1/root.db ./ns1/root.db.signed

bin/tests/system/geoip2/clean.sh

@@ -16,5 +16,4 @@ rm -f ns2/example*.db
 rm -f dig.out.* rndc.out.*
 rm -f ns?/named.run
 rm -f ns?/named.memstats
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind* ns*/*.mkeys*

bin/tests/system/glue/clean.sh

@@ -22,6 +22,5 @@ rm -f dig.out
 rm -f ns*/K*
 rm -f ns*/dsset-*
 rm -f ns*/managed-keys.bind*
-rm -f ns*/named.lock
 rm -f ns*/tc-test-signed.db
 rm -f ns*/tc-test-signed.db.signed

bin/tests/system/host/clean.sh

@@ -14,7 +14,6 @@
 rm -f ns1/example.db
 rm -f host.out*
 rm -f host.err*
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns*/named.conf

bin/tests/system/idna/clean.sh

@@ -15,5 +15,4 @@ rm -f */named.memstats
 rm -f */named.run
 rm -f */named.conf
 rm -f dig.out.*
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*

bin/tests/system/include-multiplecfg/clean.sh

@@ -18,6 +18,5 @@
 rm -f dig.out.*
 rm -f ns*/named.conf
 rm -f */named.memstats
-rm -f ns*/named.lock
 rm -f ns*/named.run ns*/named.run.prev
 rm -f ns*/managed-keys.bind* ns*/*.mkeys*

bin/tests/system/inline/clean.sh

@@ -13,7 +13,7 @@
 
 rm -rf ./*/*.jbk \
   ./*/*.nzd ./*/*.nzd-lock ./*/*.nzf \
-  ./*/named.conf ./*/named.memstats ./*/named.run* ./*/named.lock \
+  ./*/named.conf ./*/named.memstats ./*/named.run* \
   ./*/trusted.conf \
   ./K* ./*/K* \
   ./checkecdsa \

bin/tests/system/ixfr/clean.sh

@@ -22,5 +22,4 @@ rm -f */named.run */named.run.prev
 rm -f */ans.run
 rm -f dig.out.test* dig.out1.test* dig.out2.test* dig.out3.test*
 rm -f ns3/large.db
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind* ns*/*.mkeys

bin/tests/system/keepalive/clean.sh

@@ -17,5 +17,4 @@ rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns*/named.conf
 rm -f ns*/named.stats
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*

bin/tests/system/legacy/clean.sh

@@ -15,7 +15,6 @@ rm -f dig.out.*
 rm -f ns*/named.conf
 rm -f ns*/named.memstats
 rm -f ns*/named.run
-rm -f ns*/named.lock
 
 # build.sh
 rm -f ns1/named_dump.db*

bin/tests/system/legacy/ns4/named.args

@@ -1 +1 @@
--m record -c named.conf -d 99 -D legacy-ns4 -X named.lock -g -U 4 -T maxcachesize=2097152 -T noedns
+-m record -c named.conf -d 99 -D legacy-ns4 -g -U 4 -T maxcachesize=2097152 -T noedns

bin/tests/system/legacy/ns5/named.args

@@ -1 +1 @@
--m record -c named.conf -d 99 -D legacy-ns5 -X named.lock -g -U 4 -T maxcachesize=2097152 -T noedns
+-m record -c named.conf -d 99 -D legacy-ns5 -g -U 4 -T maxcachesize=2097152 -T noedns

bin/tests/system/legacy/ns6/named.args

@@ -1 +1 @@
--m record -c named.conf -d 99 -D legacy-ns6 -X named.lock -g -U 4 -T maxcachesize=2097152 -T maxudp512
+-m record -c named.conf -d 99 -D legacy-ns6 -g -U 4 -T maxcachesize=2097152 -T maxudp512

bin/tests/system/legacy/ns7/named.args

@@ -1 +1 @@
--m record -c named.conf -d 99 -D legacy-ns7 -X named.lock -g -U 4 -T maxcachesize=2097152 -T maxudp512
+-m record -c named.conf -d 99 -D legacy-ns7 -g -U 4 -T maxcachesize=2097152 -T maxudp512

bin/tests/system/limits/clean.sh

@@ -18,5 +18,4 @@ rm -f dig.out.*
 rm -f */named.memstats
 rm -f */named.conf
 rm -f */named.run
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*

bin/tests/system/logfileconfig/clean.sh

@@ -21,7 +21,6 @@ rm -f ns1/named.memstats ns1/dig.out
 rm -f ns1/named_log ns1/named_pipe ns1/named_sym
 rm -rf ns1/named_dir
 rm -f ns1/named_deflog
-rm -f ns*/named.lock
 rm -f ns1/query_log
 rm -f ns1/named_iso8601
 rm -f ns1/named_iso8601_utc

bin/tests/system/logfileconfig/named1.args

@@ -1 +1 @@
--c named.conf -m record -T nosyslog -d 99 -D logfileconfig-ns1 -X named.lock -U 4
+-c named.conf -m record -T nosyslog -d 99 -D logfileconfig-ns1 -U 4

bin/tests/system/logfileconfig/named2.args

@@ -1 +1 @@
--c named.conf -m record -T nosyslog -d 99 -D logfileconfig-ns1 -X named.lock -U 4 -L named_deflog
+-c named.conf -m record -T nosyslog -d 99 -D logfileconfig-ns1 -U 4 -L named_deflog

bin/tests/system/masterfile/clean.sh

@@ -15,6 +15,5 @@ rm -f dig.out.*
 rm -f */named.memstats
 rm -f */named.conf
 rm -f */named.run
-rm -f ns*/named.lock
 rm -f checkzone.out*
 rm -f ns*/managed-keys.bind*

bin/tests/system/masterformat/clean.sh

@@ -34,5 +34,4 @@ rm -f ./ns3/example.db.raw ./ns3/dynamic.db.raw
 rm -f ./baseline.txt ./text.* ./raw.*
 rm -f ./ns1/Ksigned.* ./ns1/dsset-signed. ./ns1/signed.db.signed
 rm -f ./rndc.out
-rm -f ./ns*/named.lock
 rm -f ./ns*/managed-keys.bind*

bin/tests/system/metadata/clean.sh

@@ -18,4 +18,3 @@ rm -f prerev.key postrev.key oldstyle.key
 rm -f keys sigs
 rm -f tmp.out
 rm -f settime1.test* settime2.test*
-rm -f ns*/named.lock

bin/tests/system/mirror/ns3/named.args

@@ -1 +1 @@
--D mirror-ns3 -X named.lock -m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152 -T tat=3
+-D mirror-ns3 -m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152 -T tat=3

bin/tests/system/mkeys/clean.sh

@@ -21,7 +21,6 @@ rm -f */named.memstats */named.run */named.run.prev
 rm -f dig.out* delv.out* rndc.out* signer.out*
 rm -f dsset-. ns1/dsset-.
 rm -f ns*/managed-keys.bind*
-rm -f ns*/named.lock
 rm -f ns1/dsset-sub.tld.
 rm -f ns1/dsset-tld.
 rm -f ns1/named.secroots ns1/root.db.signed* ns1/root.db.tmp

bin/tests/system/mkeys/ns2/named.args

@@ -1 +1 @@
--m record -c named.conf -d 99 -D mkeys-ns2 -X named.lock -g -T maxcachesize=2097152 -T mkeytimers=5/10/20 -T tat=1
+-m record -c named.conf -d 99 -D mkeys-ns2 -g -T maxcachesize=2097152 -T mkeytimers=5/10/20 -T tat=1

bin/tests/system/mkeys/ns3/named.args

@@ -1 +1 @@
--m record -c named.conf -d 99 -D mkeys-ns3 -X named.lock -g -T maxcachesize=2097152 -T mkeytimers=5/10/20
+-m record -c named.conf -d 99 -D mkeys-ns3 -g -T maxcachesize=2097152 -T mkeytimers=5/10/20

bin/tests/system/mkeys/ns5/named1.args

@@ -1 +1 @@
--m record -c named.conf -d 99 -X named.lock -g -T maxcachesize=2097152
+-m record -c named.conf -d 99 -g -T maxcachesize=2097152

bin/tests/system/mkeys/ns5/named2.args

@@ -1 +1 @@
--m record -c named.conf -d 99 -X named.lock -g -T maxcachesize=2097152 -T mkeytimers=2/20/40
+-m record -c named.conf -d 99 -g -T maxcachesize=2097152 -T mkeytimers=2/20/40

bin/tests/system/mkeys/ns6/named.args

@@ -1 +1 @@
--m record -c named.conf -d 99 -X named.lock -g -T maxcachesize=2097152 -T mkeytimers=5/10/20
+-m record -c named.conf -d 99 -g -T maxcachesize=2097152 -T mkeytimers=5/10/20

bin/tests/system/names/clean.sh

@@ -12,7 +12,6 @@
 # information regarding copyright ownership.
 
 rm -f dig.*.test*
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns*/named.pid

bin/tests/system/notify/clean.sh

@@ -26,7 +26,6 @@ rm -f dig.out.ns3.test*
 rm -f dig.out.ns4.test*
 rm -f log.out
 rm -f ns*/managed-keys.bind* ns*/*.mkeys*
-rm -f ns*/named.lock
 rm -f ns2/example.db
 rm -f ns2/x21.db*
 rm -f ns3/example.bk

bin/tests/system/nslookup/clean.sh

@@ -14,7 +14,6 @@
 rm -f ns1/example.db
 rm -f nslookup.out*
 rm -f nslookup.err*
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns*/named.conf

bin/tests/system/nsupdate/clean.sh

@@ -27,7 +27,6 @@ rm -f jp.out.ns3.*
 rm -f keygen.out.*
 rm -f nextpart.out.*
 rm -f ns*/managed-keys.bind* ns*/*.mkeys*
-rm -f ns*/named.lock
 rm -f ns1/example.db ns1/unixtime.db ns1/yyyymmddvv.db ns1/update.db ns1/other.db ns1/keytests.db
 rm -f ns1/many.test.db
 rm -f ns1/maxjournal.db

bin/tests/system/nsupdate/ns5/named.args

@@ -1 +1 @@
--D nsupdate-ns5 -m record -c named.conf -d 99 -X named.lock -g -U 4 -T maxcachesize=2097152 -T fixedlocal
+-D nsupdate-ns5 -m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152 -T fixedlocal

bin/tests/system/nsupdate/ns6/named.args

@@ -1 +1 @@
--D nsupdate-ns6 -m record -c named.conf -d 99 -X named.lock -g -U 4 -T maxcachesize=2097152 -T fixedlocal
+-D nsupdate-ns6 -m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152 -T fixedlocal

bin/tests/system/padding/clean.sh

@@ -16,6 +16,5 @@ rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns*/named.stats
 rm -f ns*/named.stats.prev
-rm -f ns*/named.lock
 rm -f ns*/named.conf
 rm -f ns*/managed-keys.bind*

bin/tests/system/pending/clean.sh

@@ -22,6 +22,5 @@ rm -rf ns1/root.db
 rm -rf ns2/example.db
 rm -rf ns2/example.com.db
 rm -rf nsupdate.out.test
-rm -f ns*/named.lock
 rm -f ns*/named.conf
 rm -f ns*/managed-keys.bind*

bin/tests/system/pipelined/clean.sh

@@ -15,5 +15,4 @@ rm -f ./*/named.conf
 rm -f ./*/named.memstats
 rm -f ./*/named.run*
 rm -f raw* output* ./*.out.*
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*

bin/tests/system/qmin/clean.sh

@@ -15,6 +15,5 @@ rm -f ns*/named.conf
 rm -f */named.memstats
 rm -f */named.run */named.run.prev
 rm -f dig.out.*
-rm -f ns*/named.lock
 rm -f ans*/query.log*
 rm -f query*.log

bin/tests/system/reclimit/clean.sh

@@ -18,5 +18,4 @@ rm -f ans4/ans.limit
 rm -f ns?/named.memstats
 rm -f ns?/named.run
 rm -f ns*/named.conf
-rm -f ns*/named.lock
 rm -f ns*/managed-keys.bind*

bin/tests/system/redirect/clean.sh

@@ -16,7 +16,6 @@ rm -f */named.memstats
 rm -f */named.run
 rm -f */named.stats
 rm -f dig.out.*
-rm -f ns*/named.lock
 rm -f ns1/K*
 rm -f ns1/dsset-nsec3.
 rm -f ns1/dsset-signed.

bin/tests/system/resolver/clean.sh

@@ -35,6 +35,5 @@ rm -f ns6/to-be-removed.tld.db ns6/to-be-removed.tld.db.jnl
 rm -f ns7/server.db ns7/server.db.jnl
 rm -f resolve.out.*.test*
 rm -f .digrc
-rm -f ns*/named.lock
 rm -f ns5/trusted.conf
 rm -f ns*/managed-keys.bind* ns*/*.mkeys*

bin/tests/system/resolver/ns9/named.args

@@ -1,2 +1,2 @@
 # this server is IPv6 only
--6 -m record -c named.conf -d 99 -D resolver-ns9 -X named.lock -g -T maxcachesize=2097152
+-6 -m record -c named.conf -d 99 -D resolver-ns9 -g -T maxcachesize=2097152

bin/tests/system/rndc/clean.sh

@@ -15,7 +15,6 @@ rm -f dig.out.*.test*
 rm -f ns*/*.nta
 rm -f ns*/managed-keys.bind* ns*/*.mkeys*
 rm -f ns*/named.conf
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run ns*/named.run.prev
 rm -f ns2/named.stats

bin/tests/system/rndc/ns6/named.args

@@ -1,3 +1,3 @@
 # teardown of a huge zone with tracing enabled takes way too long
 # -m none is set so that stop.pl does not timeout
--D rndc-ns6 -X named.lock -m none -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152
+-D rndc-ns6 -m none -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152

bin/tests/system/rpz/clean.sh

@@ -50,7 +50,6 @@ if [ ${PARTIAL:-unset} = unset ]; then
   rm -f ns5/requests ns5/*.perf
   rm -f */named.memstats */*.run */*.run.prev */named.stats */session.key
   rm -f */*.log */*core */*.pid
-  rm -f ns*/named.lock
   rm -f ns*/named.conf
   rm -f ns*/*switch
   rm -f dnsrps.zones

bin/tests/system/rpz/ns5/named.args

@@ -1,2 +1,2 @@
 # run the performance test close to real life
--c named.conf -D rpz-ns5 -X named.lock -gd3 -T maxcachesize=2097152
+-c named.conf -D rpz-ns5 -gd3 -T maxcachesize=2097152

bin/tests/system/rpzextra/clean.sh

@@ -13,7 +13,6 @@
 
 rm -f ns*/*.jnl
 rm -f ns*/named.conf
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns*/rpz*.txt

bin/tests/system/rpzextra/ns3/named.args

@@ -1 +1 @@
- -m record -c named.conf -d 99 -D rpzextra-ns1 -X named.lock -U 4 -T maxcachesize=2097152
+ -m record -c named.conf -d 99 -D rpzextra-ns1 -U 4 -T maxcachesize=2097152

bin/tests/system/rpzrecurse/clean.sh

@@ -15,7 +15,6 @@
 
 rm -f dig.out.*
 
-rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/*.run
 rm -f ns*/*core *core

bin/tests/system/rrchecker/clean.sh

@@ -12,4 +12,3 @@
 # information regarding copyright ownership.
 
 rm -f classlist.out privatelist.out typelist.out tempzone checkzone.out* checker.out
-rm -f ns*/named.lock

bin/tests/system/rrl/clean.sh

@@ -19,5 +19,4 @@ rm -f broken.out
 rm -f dig.out* *mdig.out*
 rm -f ns*/managed-keys.bind*
 rm -f ns*/named.conf
-rm -f ns*/named.lock
 rm -f ns3/bl*.db */*.jnl */*.core */*.pid

bin/tests/system/rrsetorder/clean.sh

@@ -18,6 +18,5 @@ rm -f dig.out.cyclic2
 rm -f ns2/root.bk
 rm -f ns?/named.run ns?/named.core
 rm -f */named.memstats
-rm -f ns*/named.lock
 rm -f ns*/named.conf
 rm -f ns*/managed-keys.bind*

bin/tests/system/rsabigexponent/clean.sh

@@ -18,6 +18,5 @@ rm -f ns*/named.memstats
 rm -f ns1/root.db
 rm -f ns2/signer.err
 rm -f dig.out.*
-rm -f ns*/named.lock
 rm -f ns*/named.conf
 rm -f ns*/managed-keys.bind*

bin/tests/system/runtime/clean.sh

@@ -18,7 +18,7 @@ rm -f */named*.run
 rm -f */named.memstats
 rm -f kill*.out
 rm -f ns*/managed-keys.bind*
-rm -f ns*/named.lock ns*/named*.pid ns*/other.lock
+rm -f ns*/named*.pid
 rm -f ns2/named.conf ns2/named-alt*.conf
 rm -f rndc.out*
 rm -rf ns2/nope