diff options
| author | jeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-25 22:12:53 +0000 |
|---|---|---|
| committer | jeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-25 22:12:53 +0000 |
| commit | 8d3a64e8580ead9eb632da96dcec4e672f7bb468 (patch) | |
| tree | 6ab3c3cb25f90f49788b9a2f22644df6a2a5fcd5 | |
| parent | 7d255112e9b2517730fd109e8b314a7434754685 (diff) | |
| download | ruby-8d3a64e8580ead9eb632da96dcec4e672f7bb468.tar.gz ruby-8d3a64e8580ead9eb632da96dcec4e672f7bb468.tar.xz ruby-8d3a64e8580ead9eb632da96dcec4e672f7bb468.zip | |
* lib/net/telnet.rb (Net::Telnet#login): Allowing "passphrase" in
addition to "password" for Telnet login prompts. [ruby-Bugs-10746]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/net/telnet.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Oct 25 07:12:03 2007 James Edward Gray II <jeg2@ruby-lang.org> + + * lib/net/telnet.rb (Net::Telnet#login): Allowing "passphrase" in + addition to "password" for Telnet login prompts. [ruby-Bugs-10746] + Wed Oct 25 06:34:11 2007 James Edward Gray II <jeg2@ruby-lang.org> * lib/net/telnet.rb (Net::Telnet#login): Making the password prompt diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb index 7157f2ac3..dfbe932dc 100644 --- a/lib/net/telnet.rb +++ b/lib/net/telnet.rb @@ -708,7 +708,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"] |