summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 17:57:53 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 17:57:53 +0000
commitaab56e10c8776dc826f53eb5589d898be04b434c (patch)
tree469abeab32fb8255dd16100ee602b0c55be27d49 /lib
parent59047a396446d98f529106cd0d9ed06de6f0061a (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_5@16913 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 a2f6065dd7..c54401851c 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"]