From 846710b6ac9e10b0c54792d069270554834df2d4 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 26 Aug 2014 08:27:24 +1000
Subject: [PATCH] 3929.   [bug]           'host -a' needed to clear idnoptions.
 [RT #36963]

(cherry picked from commit 905ba39e10a8f483d167b992ec31f4c0bf34326e)
---
 CHANGES        | 2 ++
 bin/dig/host.c | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/CHANGES b/CHANGES
index 2b4f1996d0..d1d7702c6c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3929.	[bug]		'host -a' needed to clear idnoptions. [RT #36963]
+
 3928.	[test]		Improve rndc system test. [RT #36898]
 
 3927.	[bug]		dig: report PKCS#11 error codes correctly when
diff --git a/bin/dig/host.c b/bin/dig/host.c
index 391ed802cb..08f89bf74c 100644
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -765,6 +765,9 @@ parse_args(isc_boolean_t is_batchfile, int argc, char **argv) {
 			if (!lookup->rdtypeset ||
 			    lookup->rdtype != dns_rdatatype_axfr)
 				lookup->rdtype = dns_rdatatype_any;
+#ifdef WITH_IDN
+			idnoptions = 0;
+#endif
 			list_type = dns_rdatatype_any;
 			list_addresses = ISC_FALSE;
 			lookup->rdtypeset = ISC_TRUE;