From: Bob Halley <halley@dnspython.org>
Date: Tue, 7 Jul 2020 02:42:51 +0000 (-0700)
Subject: Fix incompatibility in getfqdn() revealed by dnspython web site change.
X-Git-Tag: v2.0.0~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b14f70f26535e8415dd5571217f4213d2bb7eb3;p=thirdparty%2Fdnspython.git

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

diff --git a/dns/resolver.py b/dns/resolver.py
index 62d01985..ab408727 100644
--- 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):