SOURCES: python-smtplib.patch - not tested fix

[arekm]

Author: arekm                        Date: Thu Nov  3 17:00:44 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- not tested fix

---- Files affected:
SOURCES:
   python-smtplib.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/python-smtplib.patch
diff -u SOURCES/python-smtplib.patch:1.2 SOURCES/python-smtplib.patch:1.3
--- SOURCES/python-smtplib.patch:1.2	Sat Sep 17 14:31:41 2005
+++ SOURCES/python-smtplib.patch	Thu Nov  3 18:00:38 2005
@@ -1,17 +1,16 @@
-diff -urN Python-2.4.1.org/Lib/smtplib.py Python-2.4.1/Lib/smtplib.py
---- Python-2.4.1.org/Lib/smtplib.py	2004-07-11 01:14:29.000000000 +0200
-+++ Python-2.4.1/Lib/smtplib.py	2005-08-12 22:04:27.000000000 +0200
-@@ -252,8 +252,11 @@
+diff -urbB Python-2.4.2.org/Lib/smtplib.py Python-2.4.2/Lib/smtplib.py
+--- Python-2.4.2.org/Lib/smtplib.py	2004-07-10 23:14:29.000000000 +0000
++++ Python-2.4.2/Lib/smtplib.py	2005-11-03 15:58:45.086681576 +0000
+@@ -252,6 +252,12 @@
                  self.local_hostname = fqdn
              else:
                  # We can't find an fqdn hostname, so use a domain literal
--                addr = socket.gethostbyname(socket.gethostname())
--                self.local_hostname = '[%s]' % addr
-+                addr = self.sock.getsockname()
-+                addr = addr[0]
-+                if addr == '0.0.0.0':
-+                       addr = socket.gethostbyname(socket.gethostname())
-+                self.local_hostname = '[%s]' % addr
++                if self.sock:
++                        addr = self.sock.getsockname()
++                        addr = addr[0]
++                        if addr == '0.0.0.0':
++                                addr = socket.gethostbyname(socket.gethostname())
++                else:
+                 addr = socket.gethostbyname(socket.gethostname())
+                 self.local_hostname = '[%s]' % addr
  
-     def set_debuglevel(self, debuglevel):
-         """Set the debug output level.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/python-smtplib.patch?r1=1.2&r2=1.3&f=u