From: Mark Andrews <marka@isc.org>
Date: Fri, 1 Sep 2017 01:17:59 +0000 (+1000)
Subject: 4697.   [bug]           Restore workaround for Microsoft Windows TSIG hash
X-Git-Tag: v9.12.0a1~67
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a8a20462b516b0cc39e9b1fb1a8dd514eb1aed29;p=thirdparty%2Fbind9.git

4697.   [bug]           Restore workaround for Microsoft Windows TSIG hash
                        computation bug. [RT #45854]
---

diff --git a/CHANGES b/CHANGES
index 9a2ffc0d461..fe3c9c29701 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4697.	[bug]		Restore workaround for Microsoft Windows TSIG hash
+			computation bug. [RT #45854]
+
 4696.	[port]		Enable filter-aaaa support by default on Windows
 			builds. [RT #45883]
 
diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index 13868401165..e563963289b 100644
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -466,6 +466,9 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
 	dns_name_copy(owner_name, name, NULL);
 	dns_rdataset_getownercase(rdataset, name);
 
+	if ((owner_name->attributes & DNS_NAMEATTR_NOCOMPRESS) != 0)
+		name->attributes |= DNS_NAMEATTR_NOCOMPRESS;
+
 	do {
 		/*
 		 * Copy out the name, type, class, ttl.