Set the domain correctly on Windows

diff --git a/ChangeLog b/ChangeLog
index ce729d140e5f1f4565c4c67332813065acff8c26..80af6757c6190ecf62fa956c3130d55ff325b0ee 100644 (file)
--- 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 2dc5aabf115636916bbdb7cb2864a9b96157060d..b535e3a1daf7a1e7e25d73aa64a8e9dc89e9078f 100644 (file)
--- 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 9173d2ba1d7a46a60b6aceffff1c4435c0adafa8..70156c1d1366be2a132544d091d9c87a0cace753 100644 (file)
--- 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: