Commit bb1ec1f6 authored by Mark Andrews's avatar Mark Andrews

Merge branch '1861-named_checknames_get-missing-dbc' into 'master'

Resolve "named_checknames_get missing DBC"

Closes #1861

See merge request !3567
parents 6f576b2c 20c07da4
Pipeline #42551 passed with stages
in 31 minutes and 36 seconds
......@@ -352,6 +352,10 @@ named_checknames_get(const cfg_obj_t **maps, const char *which,
const cfg_obj_t *value;
int i;
REQUIRE(maps != NULL);
REQUIRE(which != NULL);
REQUIRE(obj != NULL && *obj == NULL);
for (i = 0;; i++) {
if (maps[i] == NULL) {
return (ISC_R_NOTFOUND);
......
......@@ -1432,6 +1432,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
INSIST(result == ISC_R_SUCCESS);
dns_zone_setrequestixfr(zone, cfg_obj_asboolean(obj));
obj = NULL;
checknames(ztype, maps, &obj);
INSIST(obj != NULL);
if (strcasecmp(cfg_obj_asstring(obj), "warn") == 0) {
......
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