Fix incompatibility in getfqdn() revealed by dnspython web site change.

diff --git a/dns/resolver.py b/dns/resolver.py
index 62d019851ec9a50941df85a9e6c915e8b47b0ef7..ab408727588db6897132a67326419ac0bd843aa6 100644 (file)
--- a/dns/resolver.py
+++ b/dns/resolver.py
@@ -1445,9 +1445,12 @@ def _getfqdn(name=None):
     if name is None:
         name = socket.gethostname()
     try:
-        return _getnameinfo(_getaddrinfo(name, 80)[0][4])[0]
+        (name, _, _) = _gethostbyaddr(name)
+        # Python's version checks aliases too, but our gethostbyname
+        # ignores them, so we do so here as well.
     except Exception:
-        return name
+        pass
+    return name
 
 
 def _gethostbyname(name):