Commit d7ee3ed4 authored by Evan Hunt's avatar Evan Hunt

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

4755.	[cleanup]	Silence unnecessary log message when NZF file doesn't
			exist. [RT #46186]
parent c3703059
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]
......
......@@ -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");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment