From a791a0ecdea2a17a8ac2c4a744af5beb7fa0deb7 Mon Sep 17 00:00:00 2001
From: guido
Date: Fri, 22 Oct 1999 13:09:20 +0000
Subject: In helo() and ehlo(), Don't fail when gethostbyaddr() fails -- just
 keep whatever gethostname() returns.  After a suggestion by Doug Wyatt.

---
 Mailman/pythonlib/smtplib.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'Mailman/pythonlib/smtplib.py')

diff --git a/Mailman/pythonlib/smtplib.py b/Mailman/pythonlib/smtplib.py
index 8cca5908e..6a3de7ff0 100755
--- a/Mailman/pythonlib/smtplib.py
+++ b/Mailman/pythonlib/smtplib.py
@@ -290,7 +290,11 @@ class SMTP:
         """
         name=string.strip(name)
         if len(name)==0:
-            name=socket.gethostbyaddr(socket.gethostname())[0]
+            name = socket.gethostname()
+            try:
+                name = socket.gethostbyaddr(name)[0]
+            except socket.error:
+                pass
         self.putcmd("helo",name)
         (code,msg)=self.getreply()
         self.helo_resp=msg
@@ -303,7 +307,11 @@ class SMTP:
         """
         name=string.strip(name)
         if len(name)==0:
-            name=socket.gethostbyaddr(socket.gethostname())[0]
+            name = socket.gethostname()
+            try:
+                name = socket.gethostbyaddr(name)[0]
+            except socket.error:
+                pass
         self.putcmd("ehlo",name)
         (code,msg)=self.getreply()
         # According to RFC1869 some (badly written) 
-- 
cgit v1.2.3-70-g09d2