[fwbuilder-commits] r2246 - branches/v3_1/src/gui

[<va...@in...>]

Author: vadim
Date: 2009-12-22 12:11:44 -0800 (Tue, 22 Dec 2009)
New Revision: 2246

Modified:
   branches/v3_1/src/gui/SSHIOS.cpp
   branches/v3_1/src/gui/SSHPIX.cpp
   branches/v3_1/src/gui/SSHSession.h
   branches/v3_1/src/gui/SSHUnx.cpp
Log:
fixes #989   Support IOS ssh login prompt "Password: "

Modified: branches/v3_1/src/gui/SSHIOS.cpp
===================================================================
--- branches/v3_1/src/gui/SSHIOS.cpp	2009-12-22 18:46:39 UTC (rev 2245)
+++ branches/v3_1/src/gui/SSHIOS.cpp	2009-12-22 20:11:44 UTC (rev 2246)
@@ -50,7 +50,8 @@
     normal_prompt=">$";
     fwb_prompt="--**--**--";
     enable_prompt="#$";
-    pwd_prompt="'s password: $";
+    pwd_prompt_1="'s password: $";
+    pwd_prompt_2="Password: ";
     epwd_prompt="Password: ";
     ssh_pwd_prompt="'s password: ";
     ssoft_config_prompt="> ";

Modified: branches/v3_1/src/gui/SSHPIX.cpp
===================================================================
--- branches/v3_1/src/gui/SSHPIX.cpp	2009-12-22 18:46:39 UTC (rev 2245)
+++ branches/v3_1/src/gui/SSHPIX.cpp	2009-12-22 20:11:44 UTC (rev 2246)
@@ -59,7 +59,8 @@
     normal_prompt="> $";
     fwb_prompt="--**--**--";
     enable_prompt="# $|# *Access Rules Download Complete";
-    pwd_prompt="'s password: $";
+    pwd_prompt_1="'s password: $";
+    pwd_prompt_2="'s password: $";
     epwd_prompt="Password: ";
     ssh_pwd_prompt="'s password: ";
     ssoft_config_prompt="> ";
@@ -156,7 +157,8 @@
     {
     case NONE:
     {
-        if ( cmpPrompt(stdoutBuffer,QRegExp(pwd_prompt)) )
+        if ( cmpPrompt(stdoutBuffer,QRegExp(pwd_prompt_1)) ||
+             cmpPrompt(stdoutBuffer,QRegExp(pwd_prompt_2)) )
         {
             stdoutBuffer="";
             proc->write( (pwd + "\n").toAscii() );

Modified: branches/v3_1/src/gui/SSHSession.h
===================================================================
--- branches/v3_1/src/gui/SSHSession.h	2009-12-22 18:46:39 UTC (rev 2245)
+++ branches/v3_1/src/gui/SSHSession.h	2009-12-22 20:11:44 UTC (rev 2246)
@@ -118,7 +118,8 @@
     QString     normal_prompt;
     QString     fwb_prompt;
     QString     enable_prompt;
-    QString     pwd_prompt;
+    QString     pwd_prompt_1;
+    QString     pwd_prompt_2;
     QString     putty_pwd_prompt;
     QString     ssh_pwd_prompt;
     QString     thinkfinger_pwd_prompt;

Modified: branches/v3_1/src/gui/SSHUnx.cpp
===================================================================
--- branches/v3_1/src/gui/SSHUnx.cpp	2009-12-22 18:46:39 UTC (rev 2245)
+++ branches/v3_1/src/gui/SSHUnx.cpp	2009-12-22 20:11:44 UTC (rev 2246)
@@ -51,7 +51,8 @@
 {
     normal_prompt="> ";
     enable_prompt="# ";
-    pwd_prompt="'s password: ";
+    pwd_prompt_1="'s password: ";
+    pwd_prompt_2="'s password: ";
     thinkfinger_pwd_prompt="Password or swipe finger:";
     epwd_prompt="Password: ";
     ssh_pwd_prompt="'s password: ";