From b940547cb9c9a5d29f72ad2683e8868bc389c5e1 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 7 Jun 2008 17:58:25 +0000 Subject: merge revision(s) 13779:13782: Merged 13781 from trunk. * lib/net/telnet.rb (Net::Telnet#login): Allowing "passphrase" in addition to "password" for Telnet login prompts. [ruby-Bugs-10746] Merged 13779 from trunk. * lib/net/telnet.rb (Net::Telnet#login): Making the password prompt pattern case insensitive. [ruby-Bugs-10746] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@16915 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/net/telnet.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb index c5f8b0429a..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 = /Password[: ]*\z/n + password_prompt = /[Pp]ass(?:word|phrase)[: ]*\z/n if options.kind_of?(Hash) username = options["Name"] password = options["Password"] -- cgit v1.2.1