summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 17:58:25 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 17:58:25 +0000
commitb940547cb9c9a5d29f72ad2683e8868bc389c5e1 (patch)
treee81d7b131df6b3f03cf98b7878a28da61bf8587b /lib
parent4c1e0db035879683aff84782738b69078c2bb3d5 (diff)
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
Diffstat (limited to 'lib')
-rw-r--r--lib/net/telnet.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb
index c5f8b04..80b95a5 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"]