- Fix #152: '*' in Rdata causes the return code to be NOERROR instead

of NX.
NLnetLabs · Jan 15, 2021 · b7b0d17 · b7b0d17
1 parent 356c2b5
commit b7b0d17
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,3 +1,7 @@
+15 January 2021: Wouter
+	- Fix #152: '*' in Rdata causes the return code to be NOERROR instead
+	  of NX.
+
 11 January 2021: Wouter
 	- Fix #151: DNAME not applied more than once to resolve the query.
 	- Fix dname test for #148.

diff --git a/doc/RELNOTES b/doc/RELNOTES
@@ -16,6 +16,8 @@ BUG FIXES:
 	  for a CNAME query.
 	- Fix configure.ac for autoconf 2.70.
 	- Fix #151: DNAME not applied more than once to resolve the query.
+	- Fix #152: '*' in Rdata causes the return code to be NOERROR instead
+	  of NX.
 
 
 4.3.4

diff --git a/query.c b/query.c
@@ -1091,6 +1091,7 @@ answer_authoritative(struct nsd   *nsd,
 	domain_type *match;
 	domain_type *original = closest_match;
 	domain_type *dname_ce;
+	domain_type *wildcard_child;
 	rrset_type *rrset;
 
 #ifdef NSEC3
@@ -1160,9 +1161,9 @@ answer_authoritative(struct nsd   *nsd,
 			closest_match, closest_encloser, newname);
 		q->zone = origzone;
 		return;
-	} else if (domain_wildcard_child(closest_encloser)) {
+	} else if ((wildcard_child=domain_wildcard_child(closest_encloser))!=NULL &&
+		wildcard_child->is_existing) {
 		/* Generate the domain from the wildcard.  */
-		domain_type *wildcard_child = domain_wildcard_child(closest_encloser);
 #ifdef RATELIMIT
 		q->wildcard_domain = wildcard_child;
 #endif