4854. [bug] query_synthcnamewildcard should stop generating the

                        response if query_synthwildcard fails. [RT #46939]

diff --git a/CHANGES b/CHANGES
index 2c4b328522669d1c9321fcc593cc85df73781589..322f65d40045a363c6733bad03e7a03120e4b502 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4854.  [bug]           query_synthcnamewildcard should stop generating the
+                       response if query_synthwildcard fails. [RT #46939]
+
 4853.  [bug]           Add REQUIRE's and INSIST's to isc_time_formatISO8601L
                        and isc_time_formatISO8601Lms. [RT #46916]
 

diff --git a/lib/ns/query.c b/lib/ns/query.c
index 6f8df29dceac73a3c02cacc25ee35d791b037aff..356ca9aa13ff8fcfa7de4bc25d3a1eca08179ceb 100644 (file)
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -8549,6 +8549,10 @@ query_synthcnamewildcard(query_ctx_t *qctx, dns_rdataset_t *rdataset,
        dns_rdata_cname_t cname;
 
        result = query_synthwildcard(qctx, rdataset, sigrdataset);
+       if (result != ISC_R_SUCCESS) {
+               return (result);
+       }
+
        qctx->client->query.attributes |= NS_QUERYATTR_PARTIALANSWER;
 
        /*