From: Petr Menšík <pemensik@redhat.com>
Date: Tue, 18 Jan 2022 11:46:22 +0000 (+0100)
Subject: Don't test new-zones-directory argument validity
X-Git-Tag: v9.19.1~30^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a7d04367a3034e0966d96afb75d582908ab7824;p=thirdparty%2Fbind9.git

Don't test new-zones-directory argument validity

Parser ensures new-zones-directory has qstring parameter before it can
reach this place. dir == NULL then should never happen on any
configuration. Replace silent check with insist.
---

diff --git a/bin/named/server.c b/bin/named/server.c
index db8f1d29fb1..e2de4277462 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -7770,9 +7770,7 @@ setup_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
 	result = named_config_get(maps, "new-zones-directory", &nzdir);
 	if (result == ISC_R_SUCCESS) {
 		dir = cfg_obj_asstring(nzdir);
-		if (dir != NULL) {
-			result = isc_file_isdirectory(dir);
-		}
+		result = isc_file_isdirectory(dir);
 		if (result != ISC_R_SUCCESS) {
 			isc_log_write(named_g_lctx, DNS_LOGCATEGORY_SECURITY,
 				      NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR,