From c9ee9718aeb203ce54824852b34f37f471849f40 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 3 Jan 2018 10:07:42 +1100
Subject: [PATCH] 4854.   [bug]           query_synthcnamewildcard should stop
 generating the                         response if query_synthwildcard fails.
 [RT #46939]

---
 CHANGES        | 3 +++
 lib/ns/query.c | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGES b/CHANGES
index 2c4b328522..322f65d400 100644
--- 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 6f8df29dce..356ca9aa13 100644
--- 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;
 
 	/*