For anonymous ftp, make sure local hostname is fully qualified.

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index 7a414e6882a98a0f4604d273cac5ce21be750a6b..a25d467cb156589c0af7d36a402faeaf79389b12 100644 (file)
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -221,6 +221,10 @@ class FTP:
                if not user: user = 'anonymous'
                if user == 'anonymous' and passwd in ('', '-'):
                        thishost = socket.gethostname()
+                       # Make sure it is fully qualified
+                       if not '.' in thishost:
+                           thisaddr = socket.gethostbyname(thishost)
+                           thishost = socket.gethostbyaddr(thisaddr)[0]
                        try:
                                if os.environ.has_key('LOGNAME'):
                                        realuser = os.environ['LOGNAME']