diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/net/telnet.rb | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Wed Oct 25 07:18:09 2007 James Edward Gray II <jeg2@ruby-lang.org> + + Merged 13781 from trunk. + + * lib/net/telnet.rb (Net::Telnet#login): Allowing "passphrase" in + addition to "password" for Telnet login prompts. [ruby-Bugs-10746] + Wed Oct 25 06:46:21 2007 James Edward Gray II <jeg2@ruby-lang.org> Merged 13779 from trunk. diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb index bcc30adad4..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 = /[Pp]assword[: ]*\z/n + password_prompt = /[Pp]ass(?:word|phrase)[: ]*\z/n if options.kind_of?(Hash) username = options["Name"] password = options["Password"] |