From: Evan Hunt <each@isc.org>
Date: Thu, 5 Oct 2017 07:12:14 +0000 (-0700)
Subject: [master] don't log when NZF file doesn't exist
X-Git-Tag: v9.12.0b1~86
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=d7ee3ed48849225213583758090e2fe5a301fbf2;p=thirdparty%2Fbind9.git

[master] don't log when NZF file doesn't exist

4755.	[cleanup]	Silence unnecessary log message when NZF file doesn't
			exist. [RT #46186]
---

diff --git a/CHANGES b/CHANGES
index 6205c7c9a80..91dfc2c6727 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4755.	[cleanup]	Silence unnecessary log message when NZF file doesn't
+			exist. [RT #46186]
+
 4754.	[bug]		dns_zone_setview needs a two stage commit to properly
 			handle errors. [RT #45841]
 
diff --git a/bin/named/server.c b/bin/named/server.c
index d5bf21105f9..5ae183a5ac4 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -6908,6 +6908,11 @@ static isc_result_t
 count_newzones(dns_view_t *view, ns_cfgctx_t *nzcfg, int *num_zonesp) {
 	isc_result_t result;
 
+	if (!isc_file_exists(view->new_zone_file)) {
+		*num_zonesp = 0;
+		return (ISC_R_SUCCESS);
+	}
+
 	/*
 	 * In the case of NZF files, we also parse the configuration in
 	 * the file at this stage.
@@ -7001,7 +7006,7 @@ setup_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
 	int i = 0;
 	isc_uint64_t mapsize = 0ULL;
 
-	REQUIRE (config != NULL);
+	REQUIRE(config != NULL);
 
 	if (vconfig != NULL)
 		voptions = cfg_tuple_get(vconfig, "options");