From: Robert Estelle Date: Sat, 11 Oct 2014 00:50:24 +0000 (-0400) Subject: Don't throw on unresolved-fqdn for overridden getfqdn. X-Git-Tag: v1.13.0~25^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F112%2Fhead;p=thirdparty%2Fdnspython.git Don't throw on unresolved-fqdn for overridden getfqdn. --- diff --git a/dns/resolver.py b/dns/resolver.py index b16f05d3..c19c6a64 100644 --- a/dns/resolver.py +++ b/dns/resolver.py @@ -1218,7 +1218,10 @@ def _getnameinfo(sockaddr, flags=0): def _getfqdn(name=None): if name is None: name = socket.gethostname() - return _getnameinfo(_getaddrinfo(name, 80)[0][4])[0] + try: + return _getnameinfo(_getaddrinfo(name, 80)[0][4])[0] + except: + return name def _gethostbyname(name): return _gethostbyname_ex(name)[2][0]