From b83a7c1076648ec372b8da18930af0d3ea9b8150 Mon Sep 17 00:00:00 2001
From: shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 12 Oct 2009 14:29:05 +0000
Subject: * lib/net/ftp.rb (login): use "anonymous@" as a default password.  
 [ruby-dev:39451]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog      |  5 +++++
 lib/net/ftp.rb | 18 +-----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e9d46e9a0d..eb4dc6f9da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 12 23:27:57 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (login): use "anonymous@" as a default password.
+	  [ruby-dev:39451]
+
 Mon Oct 12 22:48:25 2009  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/ftp.rb (retrlines): added a new block parameter.
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index 1641f04a3c..8ae3e1610f 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -363,22 +363,6 @@ module Net
     end
     private :transfercmd
 
-    def getaddress
-      thishost = Socket.gethostname
-      if not thishost.index(".")
-	thishost = Socket.gethostbyname(thishost)[0]
-      end
-      if ENV.has_key?("LOGNAME")
-	realuser = ENV["LOGNAME"]
-      elsif ENV.has_key?("USER")
-	realuser = ENV["USER"]
-      else
-	realuser = "anonymous"
-      end
-      return realuser + "@" + thishost
-    end
-    private :getaddress
-
     #
     # Logs in to the remote host. The session must have been previously
     # connected.  If +user+ is the string "anonymous" and the +password+ is
@@ -389,7 +373,7 @@ module Net
     #
     def login(user = "anonymous", passwd = nil, acct = nil)
       if user == "anonymous" and passwd == nil
-	passwd = getaddress
+	passwd = "anonymous@"
       end
 
       resp = ""
-- 
cgit v1.2.1