pull up use_tsig() invocation fix

diff --git a/ChangeLog b/ChangeLog
index 37f62ea85faf1816c4c8ee67925da108c7bd4295..73a66edef68ca86dd362791e1e5029310f9a9d40 100644 (file)
--- 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 f898c80892c7ec855391de57e4fbc248c8bc8ae2..3512b4b8785cbfc109936fad630eb6b8f1c66e62 100644 (file)
--- 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 33e0a956e12c68f6cc4bb00578350a240d48aab0..4a1a373928337d368d56dc6756fb43c0e6902344 100644 (file)
--- 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."""