* lib/net/ftp.rb (login): raise FTPReplyError if passwd or acct

is not supplied. fixed [ruby-core:18058]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
lann · Aug 7, 2008 · 16a2418 · 16a2418
1 parent 0ff8385
commit 16a2418
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug  7 20:52:08 2008  Shugo Maeda  <[email protected]>
+
+	* lib/net/ftp.rb (login): raise FTPReplyError if passwd or acct
+	  is not supplied.  fixed [ruby-core:18058].
+
 Thu Aug  7 18:01:44 2008  Akinori MUSHA  <[email protected]>
 
 	* misc/ruby-mode.el (ruby-imenu-create-index-in-block): Fix the

diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
@@ -396,9 +396,11 @@ def login(user = "anonymous", passwd = nil, acct = nil)
       synchronize do
 	resp = sendcmd('USER ' + user)
 	if resp[0] == ?3
+          raise FTPReplyError, resp if passwd.nil?
 	  resp = sendcmd('PASS ' + passwd)
 	end
 	if resp[0] == ?3
+          raise FTPReplyError, resp if acct.nil?
 	  resp = sendcmd('ACCT ' + acct)
 	end
       end