jeg2	2007-10-26 07:18:58 +0900 (Fri, 26 Oct 2007)

  New Revision: 13782

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/net/telnet.rb

  Log:
    Merged 13781 from trunk.
    
    * lib/net/telnet.rb (Net::Telnet#login): Allowing "passphrase" in
      addition to "password" for Telnet login prompts. [ruby-Bugs-10746]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=13782&r2=13781
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/net/telnet.rb?r1=13782&r2=13781

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 13781)
+++ ruby_1_8/ChangeLog	(revision 13782)
@@ -1,3 +1,10 @@
+Wed Oct 25 07:18:09 2007  James Edward Gray II  <jeg2@r...>
+
+	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@r...>
 
 	Merged 13779 from trunk.
Index: ruby_1_8/lib/net/telnet.rb
===================================================================
--- ruby_1_8/lib/net/telnet.rb	(revision 13781)
+++ ruby_1_8/lib/net/telnet.rb	(revision 13782)
@@ -705,7 +705,7 @@
     # 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"]

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml