From: Mark Andrews <marka@isc.org>
Date: Fri, 10 Apr 2026 00:26:14 +0000 (+1000)
Subject: Properly handle rpz name to long wildcard expansion
X-Git-Tag: v9.21.24~14^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cfc4c4f69870ce492deaaa429453563d1621ded3;p=thirdparty%2Fbind9.git

Properly handle rpz name to long wildcard expansion

Previously a self referential CNAME and the original address
record were returned.  We now return a YXDOMAIN response.
---

diff --git a/lib/ns/query.c b/lib/ns/query.c
index 70e4c2eb2bd..2a68906ae9f 100644
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -6942,7 +6942,8 @@ query_rpzcname(query_ctx_t *qctx, dns_name_t *cname) {
 					      qctx->fname);
 		if (result == DNS_R_NAMETOOLONG) {
 			client->message->rcode = dns_rcode_yxdomain;
-		} else if (result != ISC_R_SUCCESS) {
+		}
+		if (result != ISC_R_SUCCESS) {
 			return result;
 		}
 	} else {