upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-12 19:59:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove references to catalog-zones

Browse source
This commit is contained in:
Mark Andrews 2016-12-27 09:42:45 +11:00
parent a1f98389a3
commit b4fe043277
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/bind9/check.c
View file

@ -2749,8 +2749,8 @@ check_trusted_key(const cfg_obj_t *key, isc_boolean_t managed,
}
static isc_result_t
check_rpz_catz(const char *rpz_catz, const cfg_obj_t *rpz_obj,
const char *viewname, isc_symtab_t *symtab, isc_log_t *logctx)
check_rpz(const char *rpz_catz, const cfg_obj_t *rpz_obj,
const char *viewname, isc_symtab_t *symtab, isc_log_t *logctx)
{
const cfg_listelt_t *element;
const cfg_obj_t *obj, *nameobj, *zoneobj;
@ -2856,20 +2856,14 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions,
}
/*
* Check that the response-policy and catalog-zones options
* refer to zones that exist.
* Check that the response-policy refers to zones that exist.
*/
if (opts != NULL) {
obj = NULL;
if (cfg_map_get(opts, "response-policy", &obj) == ISC_R_SUCCESS
&& check_rpz_catz("response-policy zone", obj,
&& check_rpz("response-policy zone", obj,
viewname, symtab, logctx) != ISC_R_SUCCESS)
result = ISC_R_FAILURE;
obj = NULL;
if (cfg_map_get(opts, "catalog-zones", &obj) == ISC_R_SUCCESS
&& check_rpz_catz("catalog zone", obj,
viewname, symtab, logctx) != ISC_R_SUCCESS)
result = ISC_R_FAILURE;
}
isc_symtab_destroy(&symtab);