summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-07 11:57:04 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-07 11:57:04 +0000
commit57a2bb783af54165c2453c1f0d9425e2c742a027 (patch)
tree803510bc7667f03a7410733ccad8fb38b97c7ae0
parenta5a60f53b3929f9e4af7344e1d0c6a2ebc3ead5f (diff)
* lib/net/ftp.rb (login): raise FTPReplyError if passwd or acct
is not supplied. backported from trunk. fixed [ruby-core:18058]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@18417 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/net/ftp.rb2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 318ed2a1a0..628cf5274e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 7 20:55:49 2008 Shugo Maeda <[email protected]>
+
+ * 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 <[email protected]>
* Makefile.in, common.mk, {bcc,win}32/Makefile.sub (clean-ext): do not
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index 2b195c2bab..d890130ce7 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -378,9 +378,11 @@ module Net
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