]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Don't test new-zones-directory argument validity
authorPetr Menšík <pemensik@redhat.com>
Tue, 18 Jan 2022 11:46:22 +0000 (12:46 +0100)
committerMark Andrews <marka@isc.org>
Fri, 29 Apr 2022 01:22:40 +0000 (11:22 +1000)
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.

bin/named/server.c

index db8f1d29fb1ada34717e85f9c3aa2b8a8b92286e..e2de4277462369164d9232358e3bc441d01c365f 100644 (file)
@@ -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,