4697. [bug] Restore workaround for Microsoft Windows TSIG hash

                        computation bug. [RT #45854]

diff --git a/CHANGES b/CHANGES
index 9a2ffc0d46164e2bb6be448df542c23cad1e32fa..fe3c9c29701c8ee2aa034a7c28e65be84b20b793 100644 (file)
--- 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 138684011653192cfdecd4a425c6a5addba956d9..e563963289bb76fc54388b531033a0154162503a 100644 (file)
--- 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.