From 197903220d47080689aaec086ec40aeceb573082 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Thu, 5 Oct 2017 11:35:40 -0700 Subject: [PATCH] [v9_11] remove no-longer-needed check for nonexistence --- bin/named/server.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/bin/named/server.c b/bin/named/server.c index 82664066e6..aa13b27878 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -6514,6 +6514,7 @@ static isc_result_t count_newzones(dns_view_t *view, ns_cfgctx_t *nzcfg, int *num_zonesp) { isc_result_t result; + /* The new zone file may not exist. That is OK. */ if (!isc_file_exists(view->new_zone_file)) { *num_zonesp = 0; return (ISC_R_SUCCESS); @@ -6540,11 +6541,6 @@ count_newzones(dns_view_t *view, ns_cfgctx_t *nzcfg, int *num_zonesp) { view->new_zone_file, num_zones); if (num_zonesp != NULL) *num_zonesp = num_zones; - } else if (result == ISC_R_FILENOTFOUND) { - /* The new zone file may not exist. That is OK. */ - result = ISC_R_SUCCESS; - if (num_zonesp != NULL) - *num_zonesp = 0; } else { isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER,