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 70e4c2eb2bd2d823cde7b1b3393f9d7566a21a05..2a68906ae9fd37d06d3b350f7dad5bf54b780ecd 100644 (file)
--- 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 {