From: Bob Halley <halley@dnspython.org>
Date: Sun, 19 Feb 2017 21:46:47 +0000 (-0800)
Subject: Always look at Windows global Domain parameter.
X-Git-Tag: v1.16.0~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=617e477dd835276b50a1ec96b15744ce1c96550b;p=thirdparty%2Fdnspython.git

Always look at Windows global Domain parameter.
[Issue #240]
---

diff --git a/dns/resolver.py b/dns/resolver.py
index 358f827c..00323835 100644
--- a/dns/resolver.py
+++ b/dns/resolver.py
@@ -645,13 +645,14 @@ class Resolver(object):
             if s not in self.search:
                 self.search.append(dns.name.from_text(s))
 
-    def _config_win32_fromkey(self, key):
+    def _config_win32_fromkey(self, key, always_try_domain):
         try:
             servers, rtype = _winreg.QueryValueEx(key, 'NameServer')
         except WindowsError:  # pylint: disable=undefined-variable
             servers = None
         if servers:
             self._config_win32_nameservers(servers)
+        if servers or always_try_domain:
             try:
                 dom, rtype = _winreg.QueryValueEx(key, 'Domain')
                 if dom:
@@ -696,7 +697,7 @@ class Resolver(object):
                                              r'SYSTEM\CurrentControlSet'
                                              r'\Services\VxD\MSTCP')
             try:
-                self._config_win32_fromkey(tcp_params)
+                self._config_win32_fromkey(tcp_params, True)
             finally:
                 tcp_params.Close()
             if want_scan:
@@ -714,7 +715,7 @@ class Resolver(object):
                             if not self._win32_is_nic_enabled(lm, guid, key):
                                 continue
                             try:
-                                self._config_win32_fromkey(key)
+                                self._config_win32_fromkey(key, False)
                             finally:
                                 key.Close()
                         except EnvironmentError: