summaryrefslogtreecommitdiff
path: root/lib/net
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-12 19:40:39 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-12 19:40:39 +0000
commitc65d935b4c13516fa695765b717001b6f5efdd12 (patch)
tree08d276ce0e11ddfaf50bdd1f4f22f866ca4e7fca /lib/net
parentf3a4870b42fcbaefd051b3754738a869b87098e2 (diff)
merge revision(s) 18417:
* 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_7@21480 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/net')
-rw-r--r--lib/net/ftp.rb2
1 files changed, 2 insertions, 0 deletions
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