Make named a singleton process [RT#37908]

Conflicts:
	bin/tests/system/conf.sh.in
	lib/dns/win32/libdns.def.in
	lib/isc/win32/file.c

The merge also needed to update files in legacy and tcp system tests
(newly introduced in master after branch was created) to introduce use
of lockfile.

CHANGES

@@ -1,3 +1,8 @@
+4022.	[func]		Stop multiple spawns of named by limiting number of
+			processes to 1. This is done by using a lockfile and
+			checking whether we can listen on any configured
+			TCP interfaces. [RT #37908]
+
 4021.	[bug]		Adjust max-recursion-queries to accommodate
 			the need for more queries when the cache is
 			empty. [RT #38104]

bin/named/include/named/globals.h

@@ -133,6 +133,9 @@ EXTERN const char *		ns_g_logfile		INIT(NULL);
 EXTERN const char *		ns_g_defaultsessionkeyfile
 					INIT(NS_LOCALSTATEDIR "/run/named/"
 							      "session.key");
+EXTERN const char *		ns_g_singletonfile	INIT(NS_LOCALSTATEDIR
+							     "/run/named/"
+							     "named.lock");
 
 #if NS_RUN_PID_DIR
 EXTERN const char *		ns_g_defaultpidfile 	INIT(NS_LOCALSTATEDIR

bin/named/include/named/interfacemgr.h

@@ -115,7 +115,14 @@ ns_interfacemgr_detach(ns_interfacemgr_t **targetp);
 void
 ns_interfacemgr_shutdown(ns_interfacemgr_t *mgr);
 
-void
+isc_boolean_t
+ns_interfacemgr_islistening(ns_interfacemgr_t *mgr);
+/*%
+ * Return if the manager is listening on any interface. It can be called
+ * after a scan or adjust.
+ */
+
+isc_result_t
 ns_interfacemgr_scan(ns_interfacemgr_t *mgr, isc_boolean_t verbose);
 /*%
  * Scan the operatings system's list of network interfaces
@@ -127,7 +134,7 @@ ns_interfacemgr_scan(ns_interfacemgr_t *mgr, isc_boolean_t verbose);
  * in named.conf.
  */
 
-void
+isc_result_t
 ns_interfacemgr_adjust(ns_interfacemgr_t *mgr, ns_listenlist_t *list,
 		       isc_boolean_t verbose);
 /*%

bin/named/interfacemgr.c

@@ -545,17 +545,19 @@ ns_interface_accepttcp(ns_interface_t *ifp) {
  tcp_bind_failure:
 	isc_socket_detach(&ifp->tcpsocket);
  tcp_socket_failure:
-	return (ISC_R_SUCCESS);
+	return (result);
 }
 
 static isc_result_t
 ns_interface_setup(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr,
 		   const char *name, ns_interface_t **ifpret,
-		   isc_boolean_t accept_tcp, isc_dscp_t dscp)
+		   isc_boolean_t accept_tcp, isc_dscp_t dscp,
+		   isc_boolean_t *tcp_addr_in_use)
 {
 	isc_result_t result;
 	ns_interface_t *ifp = NULL;
 	REQUIRE(ifpret != NULL && *ifpret == NULL);
+	REQUIRE(tcp_addr_in_use == NULL || *tcp_addr_in_use == ISC_FALSE);
 
 	result = ns_interface_create(mgr, addr, name, &ifp);
 	if (result != ISC_R_SUCCESS)
@@ -570,6 +572,10 @@ ns_interface_setup(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr,
 	if (!ns_g_notcp && accept_tcp == ISC_TRUE) {
 		result = ns_interface_accepttcp(ifp);
 		if (result != ISC_R_SUCCESS) {
+			if ((result == ISC_R_ADDRINUSE) &&
+			    (tcp_addr_in_use != NULL))
+				*tcp_addr_in_use = ISC_TRUE;
+
 			/*
 			 * XXXRTH We don't currently have a way to easily stop
 			 * dispatch service, so we currently return
@@ -807,6 +813,8 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen,
 	isc_boolean_t log_explicit = ISC_FALSE;
 	isc_boolean_t dolistenon;
 	char sabuf[ISC_SOCKADDR_FORMATSIZE];
+	isc_boolean_t tried_listening;
+	isc_boolean_t all_addresses_in_use;
 
 	if (ext_listen != NULL)
 		adjusting = ISC_TRUE;
@@ -883,7 +891,8 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen,
 				result = ns_interface_setup(mgr, &listen_addr,
 							    "<any>", &ifp,
 							    ISC_TRUE,
-							    le->dscp);
+							    le->dscp,
+							    NULL);
 				if (result == ISC_R_SUCCESS)
 					ifp->flags |= NS_INTERFACEFLAG_ANYADDR;
 				else
@@ -913,6 +922,8 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen,
 		clearlistenon(mgr);
 	}
 
+	tried_listening = ISC_FALSE;
+	all_addresses_in_use = ISC_TRUE;
 	for (result = isc_interfaceiter_first(iter);
 	     result == ISC_R_SUCCESS;
 	     result = isc_interfaceiter_next(iter))
@@ -1049,6 +1060,8 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen,
 						      sabuf, ifp->dscp);
 				}
 			} else {
+			        isc_boolean_t tcp_addr_in_use = ISC_FALSE;
+
 				if (adjusting == ISC_FALSE &&
 				    ipv6_wildcard == ISC_TRUE)
 					continue;
@@ -1083,7 +1096,12 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen,
 						    &ifp,
 						    (adjusting == ISC_TRUE) ?
 						    ISC_FALSE : ISC_TRUE,
-						    le->dscp);
+						    le->dscp,
+						    &tcp_addr_in_use);
+
+				tried_listening = ISC_TRUE;
+				if (!tcp_addr_in_use)
+					all_addresses_in_use = ISC_FALSE;
 
 				if (result != ISC_R_SUCCESS) {
 					isc_log_write(IFMGR_COMMON_LOGARGS,
@@ -1114,23 +1132,26 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen,
 				 "interface iteration failed: %s",
 				 isc_result_totext(result));
 	else
-		result = ISC_R_SUCCESS;
+		result = ((tried_listening && all_addresses_in_use) ?
+			  ISC_R_ADDRINUSE : ISC_R_SUCCESS);
  cleanup_iter:
 	isc_interfaceiter_destroy(&iter);
 	return (result);
 }
 
-static void
+static isc_result_t
 ns_interfacemgr_scan0(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen,
 		      isc_boolean_t verbose)
 {
+	isc_result_t result;
 	isc_boolean_t purge = ISC_TRUE;
 
 	REQUIRE(NS_INTERFACEMGR_VALID(mgr));
 
 	mgr->generation++;	/* Increment the generation count. */
 
-	if (do_scan(mgr, ext_listen, verbose) != ISC_R_SUCCESS)
+	result = do_scan(mgr, ext_listen, verbose);
+	if ((result != ISC_R_SUCCESS) && (result != ISC_R_ADDRINUSE))
 		purge = ISC_FALSE;
 
 	/*
@@ -1152,18 +1173,27 @@ ns_interfacemgr_scan0(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen,
 		isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_WARNING,
 			      "not listening on any interfaces");
 	}
+
+	return (result);
 }
 
-void
+isc_boolean_t
+ns_interfacemgr_islistening(ns_interfacemgr_t *mgr) {
+	REQUIRE(NS_INTERFACEMGR_VALID(mgr));
+
+	return (ISC_LIST_EMPTY(mgr->interfaces) ? ISC_FALSE : ISC_TRUE);
+}
+
+isc_result_t
 ns_interfacemgr_scan(ns_interfacemgr_t *mgr, isc_boolean_t verbose) {
-	ns_interfacemgr_scan0(mgr, NULL, verbose);
+	return (ns_interfacemgr_scan0(mgr, NULL, verbose));
 }
 
-void
+isc_result_t
 ns_interfacemgr_adjust(ns_interfacemgr_t *mgr, ns_listenlist_t *list,
 		       isc_boolean_t verbose)
 {
-	ns_interfacemgr_scan0(mgr, list, verbose);
+	return (ns_interfacemgr_scan0(mgr, list, verbose));
 }
 
 void

bin/named/main.c

@@ -424,7 +424,7 @@ parse_command_line(int argc, char *argv[]) {
 	save_command_line(argc, argv);
 
 	/* PLEASE keep options synchronized when main is hooked! */
-#define CMDLINE_FLAGS "46c:C:d:D:E:fFgi:lL:m:n:N:p:P:sS:t:T:U:u:vVx:"
+#define CMDLINE_FLAGS "46c:C:d:D:E:fFgi:lL:m:n:N:p:P:sS:t:T:U:u:vVx:X:"
 	isc_commandline_errprint = ISC_FALSE;
 	while ((ch = isc_commandline_parse(argc, argv, CMDLINE_FLAGS)) != -1) {
 		switch (ch) {
@@ -613,6 +613,12 @@ parse_command_line(int argc, char *argv[]) {
 			       LIBXML_DOTTED_VERSION);
 #endif
 			exit(0);
+		case 'x':
+			/* Obsolete. No longer in use. Ignore. */
+			break;
+		case 'X':
+			ns_g_singletonfile = isc_commandline_argument;
+			break;
 		case 'F':
 			/* Reserved for FIPS mode */
 			/* FALLTHROUGH */
@@ -1215,6 +1221,11 @@ main(int argc, char *argv[]) {
 
 	parse_command_line(argc, argv);
 
+	if (!ns_os_issingleton(ns_g_singletonfile))
+		ns_main_earlyfatal("could not lock %s; "
+				   "another named process may be running",
+				   ns_g_singletonfile);
+
 	/*
 	 * Warn about common configuration error.
 	 */

bin/named/named.docbook

@@ -77,6 +77,7 @@
       <arg><option>-u <replaceable class="parameter">user</replaceable></option></arg>
       <arg><option>-v</option></arg>
       <arg><option>-V</option></arg>
+      <arg><option>-X <replaceable class="parameter">lock-file</replaceable></option></arg>
       <arg><option>-x <replaceable class="parameter">cache-file</replaceable></option></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -378,6 +379,18 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term>-X <replaceable class="parameter">lock-file</replaceable></term>
+        <listitem>
+          <para>
+            Acquire a lock on the specified file at runtime; this
+            helps to prevent duplicate <command>named</command> instances
+            from running simultaneously. If not specified via this option,
+            the default lockfile is <filename>/var/run/named/named.lock</filename>.
+          </para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term>-x <replaceable class="parameter">cache-file</replaceable></term>
         <listitem>

bin/named/server.c

@@ -4718,14 +4718,15 @@ directory_callback(const char *clausename, const cfg_obj_t *obj, void *arg) {
 	return (ISC_R_SUCCESS);
 }
 
-static void
+static isc_result_t
 scan_interfaces(ns_server_t *server, isc_boolean_t verbose) {
+	isc_result_t result;
 	isc_boolean_t match_mapped = server->aclenv.match_mapped;
 #ifdef HAVE_GEOIP
 	isc_boolean_t use_ecs = server->aclenv.geoip_use_ecs;
 #endif
 
-	ns_interfacemgr_scan(server->interfacemgr, verbose);
+	result = ns_interfacemgr_scan(server->interfacemgr, verbose);
 	/*
 	 * Update the "localhost" and "localnets" ACLs to match the
 	 * current set of network interfaces.
@@ -4737,6 +4738,8 @@ scan_interfaces(ns_server_t *server, isc_boolean_t verbose) {
 #ifdef HAVE_GEOIP
 	server->aclenv.geoip_use_ecs = use_ecs;
 #endif
+
+	return (result);
 }
 
 static isc_result_t
@@ -5827,7 +5830,20 @@ load_configuration(const char *filename, ns_server_t *server,
 	 * to configure the query source, since the dispatcher we use might
 	 * be shared with an interface.
 	 */
-	scan_interfaces(server, ISC_TRUE);
+	result = scan_interfaces(server, ISC_TRUE);
+
+	/*
+	 * Check that named is able to TCP listen on at least one
+	 * interface. Otherwise, another named process could be running
+	 * and we should fail.
+	 */
+	if (first_time && (result == ISC_R_ADDRINUSE)) {
+		isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+			      NS_LOGMODULE_SERVER, ISC_LOG_ERROR,
+			      "unable to listen on any configured interfaces");
+		result = ISC_R_FAILURE;
+		goto cleanup;
+	}
 
 	/*
 	 * Arrange for further interface scanning to occur periodically

bin/named/unix/include/named/os.h

@@ -57,6 +57,9 @@ ns_os_openfile(const char *filename, mode_t mode, isc_boolean_t switch_user);
 void
 ns_os_writepidfile(const char *filename, isc_boolean_t first_time);
 
+isc_boolean_t
+ns_os_issingleton(const char *filename);
+
 void
 ns_os_shutdown(void);
 

bin/named/unix/os.c

@@ -55,6 +55,7 @@
 
 static char *pidfile = NULL;
 static int devnullfd = -1;
+static int singletonfd = -1;
 
 #ifndef ISC_FACILITY
 #define ISC_FACILITY LOG_DAEMON
@@ -900,10 +901,47 @@ ns_os_writepidfile(const char *filename, isc_boolean_t first_time) {
 	(void)fclose(lockfile);
 }
 
+isc_boolean_t
+ns_os_issingleton(const char *filename) {
+	struct flock lock;
+
+	if (singletonfd != -1)
+		return (ISC_TRUE);
+
+	/*
+	 * ns_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)
+		return (ISC_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) {
+		close(singletonfd);
+		singletonfd = -1;
+		return (ISC_FALSE);
+	}
+
+	return (ISC_TRUE);
+}
+
 void
 ns_os_shutdown(void) {
 	closelog();
 	cleanup_pidfile();
+
+	if (singletonfd != -1) {
+		close(singletonfd);
+		singletonfd = -1;
+	}
 }
 
 isc_result_t

bin/named/win32/include/named/os.h

@@ -55,6 +55,9 @@ ns_os_openfile(const char *filename, int mode, isc_boolean_t switch_user);
 void
 ns_os_writepidfile(const char *filename, isc_boolean_t first_time);
 
+isc_boolean_t
+ns_os_issingleton(const char *filename);
+
 void
 ns_os_shutdown(void);
 

bin/named/win32/os.c

@@ -49,6 +49,7 @@
 
 static char *pidfile = NULL;
 static int devnullfd = -1;
+static int singletonfd = -1;
 
 static BOOL Initialized = FALSE;
 
@@ -282,10 +283,46 @@ ns_os_writepidfile(const char *filename, isc_boolean_t first_time) {
 	(void)fclose(lockfile);
 }
 
+isc_boolean_t
+ns_os_issingleton(const char *filename) {
+	OVERLAPPED o;
+
+	if (singletonfd != -1)
+		return (ISC_TRUE);
+
+	/*
+	 * ns_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)
+		return (ISC_FALSE);
+
+	memset(&o, 0, sizeof(o));
+	/* Expect ERROR_LOCK_VIOLATION if already locked */
+	if (!LockFileEx((HANDLE) _get_osfhandle(singletonfd),
+			LOCKFILE_EXCLUSIVE_LOCK | LOCKFILE_FAIL_IMMEDIATELY,
+			0, 0, 1, &o)) {
+		close(singletonfd);
+		singletonfd = -1;
+		return (ISC_FALSE);
+	}
+
+	return (ISC_TRUE);
+}
+
 void
 ns_os_shutdown(void) {
 	closelog();
 	cleanup_pidfile();
+
+	if (singletonfd != -1) {
+		(void) UnlockFile((HANDLE) _get_osfhandle(singletonfd),
+				  0, 0, 0, 1);
+		close(singletonfd);
+		singletonfd = -1;
+	}
 	ntservice_shutdown();	/* This MUST be the last thing done */
 }
 

bin/tests/system/acl/clean.sh

@@ -23,3 +23,4 @@
 rm -f dig.out.*
 rm -f ns2/example.db ns2/tsigzone.db ns2/example.db.jnl ns2/named.conf
 rm -f */named.memstats
+rm -f ns*/named.lock

bin/tests/system/additional/clean.sh

@@ -24,3 +24,4 @@ rm -f dig.out.*
 rm -f */named.memstats
 rm -f */named.conf
 rm -f */named.run
+rm -f ns*/named.lock

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

@@ -1,2 +1,2 @@
 # this server runs named with only one worker thread
--m record,size,mctx -c named.conf -d 99 -g -T clienttest -n 1
+-m record,size,mctx -c named.conf -d 99 -X named.lock -g -T clienttest -n 1

bin/tests/system/addzone/clean.sh

@@ -25,3 +25,4 @@ rm -f ns2/core*
 rm -f ns2/inline.db.jbk
 rm -f ns2/inline.db.signed
 rm -f ns2/inlineslave.bk*
+rm -f ns*/named.lock

bin/tests/system/allow_query/clean.sh

@@ -23,3 +23,4 @@
 rm -f dig.out.*
 rm -f ns2/named.conf
 rm -f */named.memstats
+rm -f ns*/named.lock

bin/tests/system/autosign/clean.sh

@@ -53,3 +53,4 @@ rm -f ns3/ttl*.db
 rm -f signing.out.*
 rm -f ns3/*.nzf
 rm -f digcomp.out.test*
+rm -f ns*/named.lock

bin/tests/system/builtin/clean.sh

@@ -18,3 +18,4 @@ rm -f ns?/named.run
 rm -f ns?/named.memstats
 rm -f rndc.status.ns*
 rm -f dig.out.ns*
+rm -f ns*/named.lock

bin/tests/system/cacheclean/clean.sh

@@ -25,3 +25,4 @@ rm -f dig.out.ns2
 rm -f dig.out.expire
 rm -f */named.memstats
 rm -f ns2/named_dump.db
+rm -f ns*/named.lock

bin/tests/system/case/clean.sh

@@ -16,3 +16,4 @@
 
 rm -f dig.ns*.test*
 rm -f ns2/example.bk
+rm -f ns*/named.lock

bin/tests/system/checkconf/clean.sh

@@ -17,3 +17,4 @@
 rm -f good.conf.in good.conf.out badzero.conf *.out
 rm -rf test.keydir
 rm -f checkconf.out*
+rm -f ns*/named.lock

bin/tests/system/checkds/clean.sh

@@ -17,3 +17,4 @@
 # $Id$
 
 rm -f checkds.*
+rm -f ns*/named.lock

bin/tests/system/checknames/clean.sh

@@ -24,3 +24,4 @@ rm -f ns1/*.update.db.jnl
 rm -f ns4/*.update.db
 rm -f ns4/*.update.db.jnl
 rm -f */named.memstats
+rm -f ns*/named.lock

bin/tests/system/checkzone/clean.sh

@@ -13,3 +13,4 @@
 # PERFORMANCE OF THIS SOFTWARE.
 
 rm -f test.* good1.db.map good1.db.raw named-compilezone
+rm -f ns*/named.lock

bin/tests/system/conf.sh.in

@@ -72,9 +72,9 @@ SUBDIRS="acl additional allow_query addzone autosign builtin
 	 legacy limits logfileconfig lwresd masterfile masterformat
 	 metadata notify nslookup nsupdate pending @PKCS11_TEST@
 	 reclimit redirect resolver rndc rpz rrl rrchecker rrsetorder
-	 rsabigexponent sit sfcache smartsign sortlist spf staticstub
+	 rsabigexponent runtime sit sfcache smartsign sortlist spf
-	 statistics stub tcp tkey tsig tsiggss unknown upforwd
+	 staticstub statistics stub tcp tkey tsig tsiggss unknown
-	 verify views wildcard xfer xferquota zero zonechecks"
+	 upforwd verify views wildcard xfer xferquota zero zonechecks"
 
 # Use the CONFIG_SHELL detected by configure for tests
 SHELL=@SHELL@

bin/tests/system/coverage/clean.sh

@@ -18,3 +18,4 @@ rm -f named-compilezone
 rm -f */K*.key
 rm -f */K*.private
 rm -rf coverage.*
+rm -f ns*/named.lock

bin/tests/system/database/clean.sh

@@ -18,3 +18,4 @@
 
 rm -f ns1/named.conf ns1/named.run ns1/named.memstats
 rm -f dig.out.*
+rm -f ns*/named.lock

bin/tests/system/delv/clean.sh

@@ -17,3 +17,4 @@
 rm -f delv.out.test*
 rm -f */named.memstats
 rm -f */named.run
+rm -f ns*/named.lock

bin/tests/system/dlv/clean.sh

@@ -43,3 +43,4 @@ rm -f ns6/dsset-*
 rm -f ns6/signer.err
 rm -f */named.memstats
 rm -f dig.out.ns*.test*
+rm -f ns*/named.lock

bin/tests/system/dlvauto/clean.sh

@@ -25,3 +25,4 @@ rm -f ns2/*.mkeys
 rm -f ns2/*.mkeys.jnl
 rm -f dig.out.ns?.test*
 rm -f ns2/named.secroots
+rm -f ns*/named.lock

bin/tests/system/dlvauto/tests.sh

@@ -31,7 +31,7 @@ then
 	ret=0
 	$PERL $SYSTEMTESTTOP/stop.pl . ns2 || ret=1
 	sleep 1
-	(cd ns2; $NAMED -g -d 100 -c named.conf >> named.run 2>&1 & )
+	(cd ns2; $NAMED -g -d 100 -X named.lock -c named.conf >> named.run 2>&1 & )
 	sleep 2
 	$DIG $DIGOPTS soa . @10.53.0.2 > dig.out.ns2.test$n || ret=1
 	grep "status: NOERROR" dig.out.ns2.test$n > /dev/null || ret=1

bin/tests/system/dlz/clean.sh

@@ -19,3 +19,4 @@
 rm -f dig.out.*
 rm -f */named.memstats
 rm -f */named.run
+rm -f ns*/named.lock

bin/tests/system/dlzexternal/clean.sh

@@ -22,3 +22,4 @@ rm -f ns1/update.txt
 rm -f */named.memstats
 rm -f ns1/ddns.key
 rm -f dig.out*
+rm -f ns*/named.lock

bin/tests/system/dname/clean.sh

@@ -21,3 +21,4 @@
 #
 rm -f */named.memstats
 rm -f dig.out.*
+rm -f ns*/named.lock

bin/tests/system/dns64/clean.sh

@@ -19,3 +19,4 @@ rm -f ns1/signed.db*
 rm -f ns1/dsset-signed.
 rm -f */named.memstats
 rm -f dig.out.*
+rm -f ns*/named.lock

bin/tests/system/dnssec/clean.sh

@@ -81,3 +81,4 @@ rm -f ns3/dnskey-nsec3-unknown.example.db
 rm -f ns3/dnskey-nsec3-unknown.example.db.tmp
 rm -f ns3/dnskey-unknown.example.db
 rm -f ns3/dnskey-unknown.example.db.tmp
+rm -f ns*/named.lock

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

@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -g -T nonearest -T clienttest
+-m record,size,mctx -c named.conf -d 99 -X named.lock -g -T nonearest -T clienttest

bin/tests/system/dscp/clean.sh

@@ -14,3 +14,4 @@
 
 rm -f */root.bk
 rm -f dig.out.10.53.0.?
+rm -f ns*/named.lock

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

@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -g -U 4 -T dscp=46
+-m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T dscp=46

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

@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -g -U 4 -T dscp=46
+-m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T dscp=46

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

@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -g -U 4 -T dscp=46
+-m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T dscp=46

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

@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -g -U 4 -T dscp=46
+-m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T dscp=46

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

@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -g -U 4 -T dscp=46
+-m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T dscp=46

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

@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -g -U 4 -T dscp=46
+-m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T dscp=46

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

@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -g -U 4 -T dscp=46
+-m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T dscp=46

bin/tests/system/dsdigest/clean.sh

@@ -22,3 +22,4 @@ rm -f ns2/good.db ns2/bad.db
 rm -f dig.out*
 rm -f */named.run
 rm -f */named.memstats
+rm -f ns*/named.lock

bin/tests/system/ecdsa/clean.sh

@@ -20,3 +20,4 @@ rm -f ns1/signer.err
 rm -f dig.out*
 rm -f */named.run
 rm -f */named.memstats
+rm -f ns*/named.lock

bin/tests/system/ednscompliance/clean.sh

@@ -15,3 +15,4 @@
 # PERFORMANCE OF THIS SOFTWARE.
 
 rm -f dig.out*
+rm -f ns*/named.lock

bin/tests/system/emptyzones/clean.sh

@@ -13,3 +13,4 @@
 # PERFORMANCE OF THIS SOFTWARE.
 
 rm -f ns1/named.conf
+rm -f ns*/named.lock

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

@@ -35,3 +35,4 @@ rm -f ns4/named.run ns4/named.conf
 rm -f ns4/named.memstats
 
 rm -f dig.out.*
+rm -f ns*/named.lock

bin/tests/system/formerr/clean.sh

@@ -15,3 +15,4 @@
 rm -f nametoolong.out 
 rm -f twoquestions.out 
 rm -f noquestions.out 
+rm -f ns*/named.lock

bin/tests/system/forward/clean.sh

@@ -20,3 +20,4 @@
 #
 rm -f dig.out.*
 rm -f */named.memstats
+rm -f ns*/named.lock

bin/tests/system/geoip/clean.sh

@@ -21,3 +21,4 @@ rm -f data2/*dat
 [ -d data2 ] && rmdir data2
 rm -f ns?/named.run
 rm -f ns?/named.memstats
+rm -f ns*/named.lock

bin/tests/system/glue/clean.sh

@@ -23,3 +23,4 @@
 
 rm -f dig.out ns1/cache
 rm -f */named.memstats
+rm -f ns*/named.lock

bin/tests/system/gost/clean.sh

@@ -20,3 +20,4 @@ rm -f ns1/signer.err
 rm -f dig.out*
 rm -f */named.run
 rm -f */named.memstats
+rm -f ns*/named.lock

bin/tests/system/inline/clean.sh

@@ -88,3 +88,4 @@ rm -f ns3/test-?.bk.signed.jnl
 rm -f import.key Kimport*
 rm -f checkgost checkdsa checkecdsa
 rm -f ns3/a-file
+rm -f ns*/named.lock

bin/tests/system/ixfr/clean.sh

@@ -23,3 +23,4 @@ rm -f ns4/*.jnl ns4/*.db
 rm -f */named.memstats
 rm -f dig.out dig.out1 dig.out2 dig.out3
 rm -f ns3/large.db
+rm -f ns*/named.lock

bin/tests/system/legacy/clean.sh

@@ -16,6 +16,7 @@ rm -f dig.out.*
 rm -f ns1/named.conf
 rm -f ns?/named.memstats
 rm -f ns?/named.run
+rm -f ns*/named.lock
 
 # build.sh
 rm -f ns6/K*

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

@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -g -U 4 -T noedns
+-m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T noedns

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

@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -g -U 4 -T noedns
+-m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T noedns

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

@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -g -U 4 -T maxudp512
+-m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T maxudp512

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

@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -g -U 4 -T maxudp512
+-m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T maxudp512

bin/tests/system/limits/clean.sh

@@ -22,3 +22,4 @@
 #
 rm -f dig.out.*
 rm -f */named.memstats
+rm -f ns*/named.lock

bin/tests/system/logfileconfig/clean.sh

@@ -25,3 +25,4 @@ rm -f ns1/named_log ns1/named_pipe ns1/named_sym
 rm -f ns1/named.conf
 rm -rf ns1/named_dir
 rm -f ns1/named_deflog
+rm -f ns*/named.lock

bin/tests/system/logfileconfig/tests.sh

@@ -32,7 +32,7 @@ SYMFILE="named_sym"
 DLFILE="named_deflog"
 PIDFILE="${THISDIR}/${CONFDIR}/named.pid"
 myRNDC="$RNDC -c ${THISDIR}/${CONFDIR}/rndc.conf"
-myNAMED="$NAMED -c ${THISDIR}/${CONFDIR}/named.conf -m record,size,mctx -T clienttest -T nosyslog -d 99 -U 4"
+myNAMED="$NAMED -c ${THISDIR}/${CONFDIR}/named.conf -m record,size,mctx -T clienttest -T nosyslog -d 99 -X named.lock -U 4"
 
 waitforpidfile() {
 	for _w in 1 2 3 4 5 6 7 8 9 10

bin/tests/system/lwresd/clean.sh

@@ -22,3 +22,4 @@
 rm -f */named.memstats
 rm -f dig.out
 rm -f lwresd1/lwresd.run.resolv
+rm -f ns*/named.lock

bin/tests/system/masterfile/clean.sh

@@ -19,3 +19,4 @@
 
 rm -f dig.out.*
 rm -f */named.memstats
+rm -f ns*/named.lock

bin/tests/system/masterformat/clean.sh

@@ -33,3 +33,4 @@ rm -f ns3/example.db.map ns3/dynamic.db.map
 rm -f baseline.txt text.1 text.2 raw.1 raw.2 map.1 map.2 map.5 text.5 badmap
 rm -f ns1/Ksigned.* ns1/dsset-signed. ns1/signed.db.signed
 rm -f rndc.out
+rm -f ns*/named.lock

bin/tests/system/metadata/clean.sh

@@ -20,3 +20,4 @@ rm -f pending.key rolling.key standby.key inact.key
 rm -f prerev.key postrev.key oldstyle.key
 rm -f keys sigs
 rm -f tmp.out
+rm -f ns*/named.lock

bin/tests/system/notify/clean.sh

@@ -28,3 +28,4 @@ rm -f ns2/example.db
 rm -f ns2/x21.db*
 rm -f ns3/example.bk
 rm -f ns4/x21.bk*
+rm -f ns*/named.lock

bin/tests/system/nslookup/clean.sh

@@ -14,3 +14,4 @@
 
 rm -f ns1/example.db
 rm -f nslookup.out*
+rm -f ns*/named.lock

bin/tests/system/nsupdate/clean.sh

@@ -38,3 +38,4 @@ rm -f Kxxx.*
 rm -f typelist.out.*
 rm -f ns1/many.test.db ns3/many.test.db.jnl
 rm -f ns3/many.test.bk ns3/many.test.bk.jnl
+rm -f ns*/named.lock

bin/tests/system/pending/clean.sh

@@ -25,3 +25,4 @@ 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

bin/tests/system/pkcs11/clean.sh

@@ -18,3 +18,4 @@ rm -f K* ns1/K* keyset-* dsset-* ns1/*.db ns1/*.signed ns1/*.jnl
 rm -f dig.out pin
 rm -f ns1/*.key ns1/named.memstats
 rm -f supported
+rm -f ns*/named.lock

bin/tests/system/pkcs11ssl/clean.sh

@@ -18,3 +18,4 @@ rm -f K* ns1/K* keyset-* dsset-* ns1/*.db ns1/*.signed ns1/*.jnl
 rm -f dig.out pin
 rm -f ns1/*.key ns1/named.memstats
 rm -f supported
+rm -f ns*/named.lock

bin/tests/system/reclimit/clean.sh

@@ -20,3 +20,4 @@ rm -f ans2/ans.limit
 rm -f ns?/named.memstats
 rm -f ns?/named.run
 rm -f ns3/named.conf
+rm -f ns*/named.lock

bin/tests/system/redirect/clean.sh

@@ -24,3 +24,4 @@ rm -f */named.run
 rm -f dig.out.*
 rm -f ns2/*.db
 rm -f rndc.out
+rm -f ns*/named.lock

bin/tests/system/resolver/clean.sh

@@ -32,3 +32,4 @@ rm -f ns6/to-be-removed.tld.db ns6/to-be-removed.tld.db.jnl
 rm -f ns7/server.db ns7/server.db.jnl ns7/named.conf
 rm -f resolve.out
 rm -f .digrc
+rm -f ns*/named.lock

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

@@ -1,2 +1,2 @@
 # this server runs named with the "-T clienttest" option omitted
--m record,size,mctx -c named.conf -d 99 -g
+-m record,size,mctx -c named.conf -d 99 -X named.lock -g

bin/tests/system/rndc/clean.sh

@@ -23,3 +23,4 @@ rm -f ns*/named.run
 rm -f ns4/*.conf
 rm -f rndc.status
 rm -f rndc.output
+rm -f ns*/named.lock

bin/tests/system/rpz/clean.sh

@@ -21,3 +21,4 @@ rm -f ns5/requests ns5/example.db ns5/bl.db ns5/*.perf
 rm -f */named.memstats */named.run */named.stats */session.key
 rm -f */*.jnl */*.core */*.pid
 rm -f */policy2.db
+rm -f ns*/named.lock

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

@@ -1,3 +1,3 @@
 # run the performace test close to real life
 
--c named.conf -gd3
+-c named.conf -X named.lock -gd3

bin/tests/system/rrchecker/clean.sh

@@ -13,3 +13,4 @@
 # PERFORMANCE OF THIS SOFTWARE.
 
 rm -f classlist.out privatelist.out typelist.out tempzone checker.out
+rm -f ns*/named.lock

bin/tests/system/rrl/clean.sh

@@ -19,3 +19,4 @@
 rm -f dig.out*
 rm -f  */named.memstats */named.run */named.stats */log-* */session.key
 rm -f ns3/bl*.db */*.jnl */*.core */*.pid
+rm -f ns*/named.lock

bin/tests/system/rrsetorder/clean.sh

@@ -23,3 +23,4 @@ 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

bin/tests/system/rsabigexponent/clean.sh

@@ -20,3 +20,4 @@ rm -f ns*/named.memstats
 rm -f ns1/root.db
 rm -f ns2/signer.err
 rm -f dig.out.*
+rm -f ns*/named.lock

bin/tests/system/runtime/README

@@ -0,0 +1,5 @@
+Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
+Tests of runtime checks, e.g., that named prevents duplicate processes
+from running.

bin/tests/system/runtime/clean.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+rm -f */named.memstats
+rm -f */named*.run
+rm -f ns*/named.lock ns*/.nolock

bin/tests/system/runtime/ns2/named-alt.conf

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+// NS2
+
+controls { /* empty */ };
+
+options {
+	query-source address 10.53.0.2;
+	port 5300;
+	pid-file "named.pid";
+	listen-on { 10.53.0.2; 10.53.0.3; };
+	listen-on-v6 { fd92:7065:b8e:ffff::2; };
+	recursion no;
+	notify yes;
+	dnssec-enable no;
+	dnssec-validation no;
+};

bin/tests/system/runtime/ns2/named.conf

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+// NS2
+
+controls { /* empty */ };
+
+options {
+	query-source address 10.53.0.2;
+	port 5300;
+	pid-file "named.pid";
+	listen-on { 10.53.0.2; };
+	listen-on-v6 { fd92:7065:b8e:ffff::2; };
+	recursion no;
+	notify yes;
+	dnssec-enable no;
+	dnssec-validation no;
+};

bin/tests/system/runtime/tests.sh

@@ -0,0 +1,48 @@
+# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+status=0
+n=0
+
+n=`expr $n + 1`
+echo "I:verifying that named started normally ($n)"
+ret=0
+[ -s ns2/named.pid ] || ret=1
+grep "unable to listen on any configured interface" ns2/named.run > /dev/null && ret=1
+grep "another named process" ns2/named.run > /dev/null && ret=1
+if [ $ret != 0 ]; then echo "I:failed"; fi
+status=`expr $status + $ret`
+
+n=`expr $n + 1`
+echo "I:verifying that named checks for conflicting listeners ($n)"
+ret=0
+(cd ns2; $NAMED -c named.conf -D ns2-extra-1 -X .nolock -m record,size,mctx -d 99 -g -U 4 >> named2.run 2>&1 & )
+sleep 2
+grep "unable to listen on any configured interface" ns2/named2.run > /dev/null || ret=1
+if [ $ret != 0 ]; then echo "I:failed"; fi
+status=`expr $status + $ret`
+
+n=`expr $n + 1`
+echo "I:verifying that named checks for conflicting named processes ($n)"
+ret=0
+(cd ns2; $NAMED -c named-alt.conf -D ns2-extra-1 -X named.lock -m record,size,mctx -d 99 -g -U 4 >> named3.run 2>&1 & )
+sleep 2
+grep "another named process" ns2/named3.run > /dev/null || ret=1
+if [ $ret != 0 ]; then echo "I:failed"; fi
+status=`expr $status + $ret`
+
+exit $status

bin/tests/system/sfcache/clean.sh

@@ -20,3 +20,4 @@ rm -f random.data
 rm -f */named.memstats
 rm -f dig.*
 rm -f sfcache.*
+rm -f ns*/named.lock

bin/tests/system/sit/clean.sh

@@ -14,3 +14,4 @@
 
 rm -f dig.out.*
 rm -f ns1/named_dump.db
+rm -f ns*/named.lock

bin/tests/system/smartsign/clean.sh

@@ -15,3 +15,4 @@
 # PERFORMANCE OF THIS SOFTWARE.
 
 rm -f K* dsset-* *.signed dnskey.sigs other.sigs dsset.out
+rm -f ns*/named.lock

bin/tests/system/sortlist/clean.sh

@@ -19,3 +19,4 @@
 
 rm -f *.dig *.good *.out
 rm -f */named.memstats
+rm -f ns*/named.lock

bin/tests/system/spf/clean.sh

@@ -14,3 +14,4 @@
 
 rm -f ns1/named.run
 rm -f ns1/named.memstats
+rm -f ns*/named.lock

bin/tests/system/start.pl

@@ -170,6 +170,7 @@ sub start_server {
 			$command .= "$options";
 		} else {
 			$command .= "-D $server ";
+			$command .= "-X named.lock ";
 			$command .= "-m record,size,mctx ";
 			$command .= "-T clienttest ";
 			$command .= "-T nosoa " 

bin/tests/system/staticstub/clean.sh

@@ -26,3 +26,4 @@ rm -f ns3/named.conf
 rm -f ns3/example.db
 rm -f ns4/sub.example.db
 rm -f dig.out.*
+rm -f ns*/named.lock

bin/tests/system/statistics/clean.sh

@@ -26,3 +26,4 @@ rm -f */named.memstats
 rm -f */named.run
 rm -f */named.stats
 rm -f dig.out*
+rm -f ns*/named.lock

bin/tests/system/stress/clean.sh

@@ -27,3 +27,4 @@ rm -f ns1/delegations.db
 rm -f ns2/zone0*.db
 rm -f ns2/zone0*.jnl
 rm -f */named.memstats
+rm -f ns*/named.lock