From: Bob Halley <halley@nominum.com>
Date: Sun, 14 Mar 2010 12:55:35 +0000 (+0000)
Subject: pull up use_tsig() invocation fix
X-Git-Tag: v1.10.0-py3~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d84a0bb6f4504963ae944bf4d69b63970e762541;p=thirdparty%2Fdnspython.git

pull up use_tsig() invocation fix
---

diff --git a/ChangeLog b/ChangeLog
index 37f62ea8..73a66ede 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-10  Bob Halley  <halley@dnspython.org>
+
+	* The TSIG algorithm value was passed to use_tsig() incorrectly
+	  in some cases.  Thanks to 'ducciovigolo' for reporting the problem.
+
 2010-01-26  Bob Halley  <halley@dnspython.org>
 
 	* (Version 1.8.0 released)
diff --git a/dns/resolver.py b/dns/resolver.py
index f898c808..3512b4b8 100644
--- a/dns/resolver.py
+++ b/dns/resolver.py
@@ -588,7 +588,8 @@ class Resolver(object):
                     return answer
             request = dns.message.make_query(qname, rdtype, rdclass)
             if not self.keyname is None:
-                request.use_tsig(self.keyring, self.keyname, self.keyalgorithm)
+                request.use_tsig(self.keyring, self.keyname,
+                                 algorithm=self.keyalgorithm)
             request.use_edns(self.edns, self.ednsflags, self.payload)
             response = None
             #
diff --git a/dns/update.py b/dns/update.py
index 33e0a956..4a1a3739 100644
--- a/dns/update.py
+++ b/dns/update.py
@@ -56,7 +56,7 @@ class Update(dns.message.Message):
         self.find_rrset(self.question, self.origin, rdclass, dns.rdatatype.SOA,
                         create=True, force_unique=True)
         if not keyring is None:
-            self.use_tsig(keyring, keyname, keyalgorithm)
+            self.use_tsig(keyring, keyname, algorithm=keyalgorithm)
 
     def _add_rr(self, name, ttl, rd, deleting=None, section=None):
         """Add a single RR to the update section."""