summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/net/telnet.rb2
2 files changed, 6 insertions, 1 deletions
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 <jeg2@ruby-lang.org>
+
+ * 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 <jeg2@ruby-lang.org>
* 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"]