From cdb674387ca19dc8550553d90d8f9731befb6f1f Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 21 Aug 2006 00:11:43 +0000
Subject: [PATCH] 2073.   [bug]           Incorrect semantics check for update
 policy "wildcard".                         [RT #16353]

---
 CHANGES           |  3 +++
 lib/bind9/check.c | 16 ++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index 371c451a78..c408c221a2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2073.	[bug]		Incorrect semantics check for update policy "wildcard".
+			[RT #16353]
+
 2072.	[bug]		We were not generating valid HMAC SHA digests.
 			[RT #16320]
 
diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index b052a50ab5..653eeb0cfd 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.75 2006/06/04 23:17:06 marka Exp $ */
+/* $Id: check.c,v 1.76 2006/08/21 00:11:43 marka Exp $ */
 
 /*! \file */
 
@@ -816,13 +816,6 @@ check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) {
 				    "'%s' is not a valid name", str);
 			result = tresult;
 		}
-		if (tresult == ISC_R_SUCCESS &&
-		    strcasecmp(cfg_obj_asstring(matchtype), "wildcard") == 0 &&
-		    !dns_name_iswildcard(dns_fixedname_name(&fixed))) {
-			cfg_obj_log(identity, logctx, ISC_LOG_ERROR,
-				    "'%s' is not a wildcard", str);
-			result = ISC_R_FAILURE;
-		}
 
 		dns_fixedname_init(&fixed);
 		str = cfg_obj_asstring(dname);
@@ -835,6 +828,13 @@ check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) {
 				    "'%s' is not a valid name", str);
 			result = tresult;
 		}
+		if (tresult == ISC_R_SUCCESS &&
+		    strcasecmp(cfg_obj_asstring(matchtype), "wildcard") == 0 &&
+		    !dns_name_iswildcard(dns_fixedname_name(&fixed))) {
+			cfg_obj_log(identity, logctx, ISC_LOG_ERROR,
+				    "'%s' is not a wildcard", str);
+			result = ISC_R_FAILURE;
+		}
 
 		for (element2 = cfg_list_first(typelist);
 		     element2 != NULL;