From d7ee3ed48849225213583758090e2fe5a301fbf2 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Thu, 5 Oct 2017 00:12:14 -0700 Subject: [PATCH] [master] don't log when NZF file doesn't exist 4755. [cleanup] Silence unnecessary log message when NZF file doesn't exist. [RT #46186] --- CHANGES | 3 +++ bin/named/server.c | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 6205c7c9a8..91dfc2c672 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 d5bf21105f..5ae183a5ac 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");