From: Bob Halley <halley@dnspython.org>
Date: Sat, 28 Jan 2017 13:53:46 +0000 (-0800)
Subject: The query refactoring accidentally changed which TSIG MAC for the
X-Git-Tag: v1.16.0~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=639991442946cf0daf06d89acfaa4df7d24fb1d0;p=thirdparty%2Fdnspython.git

The query refactoring accidentally changed which TSIG MAC for the
request was passed to TSIG validation, resulting in failed
validations.
[Issue #228]
---

diff --git a/dns/query.py b/dns/query.py
index 507b9d28..5087c95a 100644
--- a/dns/query.py
+++ b/dns/query.py
@@ -303,7 +303,7 @@ def udp(q, where, timeout=None, port=53, af=None, source=None, source_port=0,
         (_, sent_time) = send_udp(s, wire, destination, expiration)
         (r, received_time) = receive_udp(s, destination, expiration,
                                          ignore_unexpected, one_rr_per_rrset,
-                                         q.keyring, q.request_mac)
+                                         q.keyring, q.mac)
     finally:
         if sent_time is None or received_time is None:
             response_time = 0
@@ -462,7 +462,7 @@ def tcp(q, where, timeout=None, port=53, af=None, source=None, source_port=0,
         _connect(s, destination)
         send_tcp(s, wire, expiration)
         (r, received_time) = receive_tcp(s, expiration, one_rr_per_rrset,
-                                         q.keyring, q.request_mac)
+                                         q.keyring, q.mac)
     finally:
         if begin_time is None or received_time is None:
             response_time = 0