From: Mark Andrews <marka@isc.org>
Date: Tue, 20 Sep 2016 11:12:16 +0000 (+1000)
Subject: 4470.   [bug]           Reset message with intent parse before
X-Git-Tag: v9.12.0a1~768
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=d9bc0a865e0dc77b6d91a71bb9a1524fc46ffaef;p=thirdparty%2Fbind9.git

4470.   [bug]           Reset message with intent parse before
                        calling dns_dispatch_getnext. [RT #43229]
---

diff --git a/CHANGES b/CHANGES
index 85871f1da3a..6d0efdf5569 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4470.	[bug]		Reset message with intent parse before
+			calling dns_dispatch_getnext. [RT #43229]
+
 4469.	[placeholder]
 
 	--- 9.11.0rc2 released ---
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 5b8698060b7..91ea9a5f3e5 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -8618,6 +8618,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
 		FCTXTRACE("nextitem");
 		inc_stats(fctx->res, dns_resstatscounter_nextitem);
 		INSIST(query->dispentry != NULL);
+		dns_message_reset(fctx->rmessage, DNS_MESSAGE_INTENTPARSE);
 		result = dns_dispatch_getnext(query->dispentry, &devent);
 		if (result != ISC_R_SUCCESS)
 			fctx_done(fctx, result, __LINE__);