summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Halley <halley@nominum.com>2009-06-19 12:35:21 +0100
committerBob Halley <halley@nominum.com>2009-06-19 12:35:21 +0100
commitcd82aef49eb706e66ab9b1b09083e56f1c1cacbf (patch)
tree8639c53197dcde57b354655dff311820471e278c
parent952bca17423861d3a9ffb4e2eee1211afbec9ec8 (diff)
downloaddnspython-cd82aef49eb706e66ab9b1b09083e56f1c1cacbf.tar.gz
Set the domain correctly on Windows
-rw-r--r--ChangeLog3
-rw-r--r--README2
-rw-r--r--dns/resolver.py4
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ce729d1..80af675 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
2009-06-19 Bob Halley <halley@dnspython.org>
+ * On Windows, the resolver set the domain incorrectly. Thanks
+ to Brandon Carpenter for reporting this bug.
+
* Added a to_digestable() method to rdata classes; it returns the
digestable form (i.e. DNSSEC canonical form) of the rdata. For
most rdata types this is the same uncompressed wire form. For
diff --git a/README b/README
index 2dc5aab..b535e3a 100644
--- a/README
+++ b/README
@@ -49,6 +49,8 @@ New since 1.6.0:
Bugs fixed since 1.6.0:
+ On Windows, the resolver set the domain incorrectly.
+
DS RR parsing only allowed one Base64 chunk.
TSIG validation didn't always use absolute names.
diff --git a/dns/resolver.py b/dns/resolver.py
index 9173d2b..70156c1 100644
--- a/dns/resolver.py
+++ b/dns/resolver.py
@@ -398,7 +398,7 @@ class Resolver(object):
try:
dom, rtype = _winreg.QueryValueEx(key, 'Domain')
if dom:
- self._config_win32_domain(servers)
+ self._config_win32_domain(dom)
except WindowsError:
pass
else:
@@ -411,7 +411,7 @@ class Resolver(object):
try:
dom, rtype = _winreg.QueryValueEx(key, 'DhcpDomain')
if dom:
- self._config_win32_domain(servers)
+ self._config_win32_domain(dom)
except WindowsError:
pass
try: