Sun Dec 29 01:38:27 2019 UTC ()

Only ignore signals if we are bind (not dhcpd).


(christos)

diff -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isc/unix/app.c

--- src/external/mpl/bind/dist/lib/isc/unix/Attic/app.c 2019/02/24 20:01:31	1.4
+++ src/external/mpl/bind/dist/lib/isc/unix/Attic/app.c 2019/12/29 01:38:27	1.5

 @@ -1,14 +1,14 @@
-/*	$NetBSD: app.c,v 1.4 2019/02/24 20:01:31 christos Exp $	*/
+/*	$NetBSD: app.c,v 1.5 2019/12/29 01:38:27 christos Exp $	*/
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
  */
 /*! \file */
 @@ -186,26 +186,27 @@ isc_app_ctxstart(isc_appctx_t *ctx0) {
 	result = handle_signal(SIGHUP, SIG_DFL);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;
 #ifdef HAVE_SIGWAIT
 	result = handle_signal(SIGTERM, SIG_DFL);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;
 	result = handle_signal(SIGINT, SIG_DFL);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;
 #endif
 	if (isc_bind9) {
 	/*
 	 * Block SIGHUP, SIGINT, SIGTERM.
+	 *
 	 * If isc_app_start() is called from the main thread before any other
 	 * threads have been created, then the pthread_sigmask() call below
 	 * will result in all threads having SIGHUP, SIGINT and SIGTERM
 	 * blocked by default, ensuring that only the thread that calls
 	 * sigwait() for them will get those signals.
 	 */
 	if (sigemptyset(&sset) != 0 ||
 	    sigaddset(&sset, SIGHUP) != 0 ||
 	    sigaddset(&sset, SIGINT) != 0 ||
 	    sigaddset(&sset, SIGTERM) != 0) {
 @@ -214,26 +215,27 @@ isc_app_ctxstart(isc_appctx_t *ctx0) {
 				 "isc_app_start() sigsetops: %s", strbuf);
 		result = ISC_R_UNEXPECTED;
 		goto cleanup;
+	}
 	presult = pthread_sigmask(SIG_BLOCK, &sset, NULL);
 	if (presult != 0) {
 		strerror_r(presult, strbuf, sizeof(strbuf));
 		UNEXPECTED_ERROR(__FILE__, __LINE__,
 				 "isc_app_start() pthread_sigmask: %s",
 				 strbuf);
 		result = ISC_R_UNEXPECTED;
 		goto cleanup;
+	}
+	}
 	return (ISC_R_SUCCESS);
  cleanup:
 	(void)isc_condition_destroy(&ctx->ready);
 	(void)isc_mutex_destroy(&ctx->readylock);
 	return (result);
+}
 isc_result_t
 isc_app_start(void) {
 	isc_g_appctx.common.impmagic = APPCTX_MAGIC;
 	isc_g_appctx.common.magic = ISCAPI_APPCTX_MAGIC;