From d520759f6507177cc2b5b74e026ba884b99ddded Mon Sep 17 00:00:00 2001 From: jeg2 Date: Thu, 25 Oct 2007 22:12:53 +0000 Subject: * 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/trunk@13781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/net/telnet.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 622f181226..198de5299b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Oct 25 07:12:03 2007 James Edward Gray II + + * 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 * lib/net/telnet.rb (Net::Telnet#login): Making the password prompt diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb index 7157f2ac34..dfbe932dcd 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"] -- cgit v1.2.3