From: Bob Halley <halley@nominum.com>
Date: Fri, 19 Jun 2009 11:35:21 +0000 (+0100)
Subject: Set the domain correctly on Windows
X-Git-Tag: v1.7.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd82aef49eb706e66ab9b1b09083e56f1c1cacbf;p=thirdparty%2Fdnspython.git

Set the domain correctly on Windows
---

diff --git a/ChangeLog b/ChangeLog
index ce729d14..80af6757 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 2dc5aabf..b535e3a1 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 9173d2ba..70156c1d 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: