From b00a764bc8feb6ee6a9b50ef90000870ff03aaea Mon Sep 17 00:00:00 2001
From: Brian Wellington <source@isc.org>
Date: Thu, 8 Jun 2000 22:31:55 +0000
Subject: [PATCH] Only print 'no IPv6 interfaces found' and 'no IPv4 interfaces
 found' addresses on startup, not each time interfaces are scanned.

---
 bin/named/include/named/interfacemgr.h | 2 +-
 bin/named/interfacemgr.c               | 8 +++++---
 bin/named/server.c                     | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/bin/named/include/named/interfacemgr.h b/bin/named/include/named/interfacemgr.h
index 871b090819..8335481bcd 100644
--- a/bin/named/include/named/interfacemgr.h
+++ b/bin/named/include/named/interfacemgr.h
@@ -108,7 +108,7 @@ void
 ns_interfacemgr_shutdown(ns_interfacemgr_t *mgr);
 
 void
-ns_interfacemgr_scan(ns_interfacemgr_t *mgr);
+ns_interfacemgr_scan(ns_interfacemgr_t *mgr, isc_boolean_t verbose);
 /*
  * Scan the operatings system's list of network interfaces
  * and create listeners when new interfaces are discovered.
diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c
index 67a1bba3da..337d54a493 100644
--- a/bin/named/interfacemgr.c
+++ b/bin/named/interfacemgr.c
@@ -658,7 +658,7 @@ do_ipv6(ns_interfacemgr_t *mgr) {
 }
 
 void
-ns_interfacemgr_scan(ns_interfacemgr_t *mgr) {
+ns_interfacemgr_scan(ns_interfacemgr_t *mgr, isc_boolean_t verbose) {
 
 	REQUIRE(NS_INTERFACEMGR_VALID(mgr));
 
@@ -667,12 +667,14 @@ ns_interfacemgr_scan(ns_interfacemgr_t *mgr) {
 	if (isc_net_probeipv6() == ISC_R_SUCCESS) {
 		do_ipv6(mgr);
 	} else
-		isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_INFO,
+		isc_log_write(IFMGR_COMMON_LOGARGS,
+			      verbose ? ISC_LOG_INFO : ISC_LOG_DEBUG(1),
 			      "no IPv6 interfaces found");
 	if (isc_net_probeipv4() == ISC_R_SUCCESS)
 		do_ipv4(mgr);
 	else
-		isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_INFO,
+		isc_log_write(IFMGR_COMMON_LOGARGS,
+			      verbose ? ISC_LOG_INFO : ISC_LOG_DEBUG(1),
 			      "no IPv4 interfaces found");
 
         /*
diff --git a/bin/named/server.c b/bin/named/server.c
index 0ddcc18350..228f8156f5 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -1063,8 +1063,8 @@ options_callback(dns_c_ctx_t *cctx, void *uap) {
 
 
 static void 
-scan_interfaces(ns_server_t *server) {
-	ns_interfacemgr_scan(server->interfacemgr);
+scan_interfaces(ns_server_t *server, isc_boolean_t verbose) {
+	ns_interfacemgr_scan(server->interfacemgr, verbose);
 	dns_aclenv_copy(&server->aclenv,
 			ns_interfacemgr_getaclenv(server->interfacemgr));
 }
@@ -1079,7 +1079,7 @@ interface_timer_tick(isc_task_t *task, isc_event_t *event) {
 	UNUSED(task);
 	isc_event_free(&event);
 	RWLOCK(&server->conflock, isc_rwlocktype_write);
-	scan_interfaces(server);
+	scan_interfaces(server, ISC_FALSE);
 	RWUNLOCK(&server->conflock, isc_rwlocktype_write);
 }
 
@@ -1214,7 +1214,7 @@ 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);
+	scan_interfaces(server, ISC_TRUE);
 
 	/*
 	 * Arrange for further interface scanning to occur periodically