shugo	2008-08-07 20:57:04 +0900 (Thu, 07 Aug 2008)

  New Revision: 18417

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18417

  Log:
    * lib/net/ftp.rb (login): raise FTPReplyError if passwd or acct
      is not supplied.  backported from trunk.  fixed [ruby-core:18058].

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/net/ftp.rb

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 18416)
+++ ruby_1_8/ChangeLog	(revision 18417)
@@ -1,3 +1,8 @@
+Thu Aug  7 20:55:49 2008  Shugo Maeda  <shugo@r...>
+
+	* lib/net/ftp.rb (login): raise FTPReplyError if passwd or acct
+	  is not supplied.  backported from trunk.  fixed [ruby-core:18058].
+
 Thu Aug  7 16:28:51 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* Makefile.in, common.mk, {bcc,win}32/Makefile.sub (clean-ext): do not
Index: ruby_1_8/lib/net/ftp.rb
===================================================================
--- ruby_1_8/lib/net/ftp.rb	(revision 18416)
+++ ruby_1_8/lib/net/ftp.rb	(revision 18417)
@@ -378,9 +378,11 @@
       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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/