In helo() and ehlo(), Don't fail when gethostbyaddr() fails -- just

keep whatever gethostname() returns.  After a suggestion by Doug Wyatt.

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 8cca5908e0e7ce788fa33ec54b5ddabe7dd90105..6a3de7ff0c9904319c4cc56cbfacf843168d1c1a 100755 (executable)
--- a/Lib/smtplib.py
+++ b/Lib/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)