diff options
author | jeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-25 22:18:58 +0000 |
---|---|---|
committer | jeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-25 22:18:58 +0000 |
commit | 8f009c18e81e75e0632da6042c33cba7a40bd252 (patch) | |
tree | b88160010d55768678e8c6ab930667d12894061e /lib | |
parent | 40e6b491eafaf7882d4c6f491e51f2456e4ce5a6 (diff) |
Merged 13781 from trunk.
* lib/net/telnet.rb (Net::Telnet#login): Allowing "passphrase" in
addition to "password" for Telnet login prompts. [ruby-Bugs-10746]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@13782 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/net/telnet.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb index bcc30adad4..80b95a5149 100644 --- a/lib/net/telnet.rb +++ b/lib/net/telnet.rb @@ -705,7 +705,7 @@ module Net # data is also yielded to the block as it is received. def login(options, password = nil) # :yield: recvdata login_prompt = /[Ll]ogin[: ]*\z/n - password_prompt = /[Pp]assword[: ]*\z/n + password_prompt = /[Pp]ass(?:word|phrase)[: ]*\z/n if options.kind_of?(Hash) username = options["Name"] password = options["Password"] |