From: Mark Andrews <marka@isc.org>
Date: Mon, 26 Dec 2016 22:42:45 +0000 (+1100)
Subject: remove references to catalog-zones
X-Git-Tag: v9.10.5b1~30
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=b4fe0432778ce1f104767dabde7e8211f94c46bb;p=thirdparty%2Fbind9.git

remove references to catalog-zones
---

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 9a9eb856d69..5637e008834 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -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);