From: Georg Brandl <georg@python.org>
Date: Fri, 31 Mar 2006 19:34:17 +0000 (+0000)
Subject: bug #1257988: don't bail out on gethostbyname(gethostname()) failure
X-Git-Tag: v2.4.4c1~312
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=831c22958e7547d7350d93dff68393bafb333657;p=thirdparty%2FPython%2Fcpython.git

bug #1257988: don't bail out on gethostbyname(gethostname()) failure
 (backport from rev. 43499)
---

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 01ef53f0007b..89548809d34b 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -255,7 +255,11 @@ class SMTP:
                 self.local_hostname = fqdn
             else:
                 # We can't find an fqdn hostname, so use a domain literal
-                addr = socket.gethostbyname(socket.gethostname())
+                addr = '127.0.0.1'
+                try:
+                    addr = socket.gethostbyname(socket.gethostname())
+                except socket.gaierror:
+                    pass
                 self.local_hostname = '[%s]' % addr
 
     def set_debuglevel(self, debuglevel):