[X2Go-Commits] [x2goclient] 03/05: sshmasterconnection.cpp: don't check prompts for full string equality - a matching prefix is good enough.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 3904a5b5a2ff7f0feacca55463a71befdc3632a0
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Jan 29 00:49:23 2016 +0100

    sshmasterconnection.cpp: don't check prompts for full string equality - a matching prefix is good enough.
    
    Amongst others, this fixes errors in conditions where the prompt does
    not contain a trailing whitespace, but X2Go Client expects one.
---
 debian/changelog            |    4 ++++
 src/sshmasterconnection.cpp |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7e6ffd4..b90bf52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,10 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
       challenge-auth-based attempt was unsuccessful.
     - sshmasterconnection.{cpp,h}: support variable number of
       challenge-auth-code-based prompts.
+    - sshmasterconnection.cpp: don't check prompts for full string equality -
+      a matching prefix is good enough. Amongst others, this fixes errors in
+      conditions where the prompt does not contain a trailing whitespace, but
+      X2Go Client expects one.
   * debian/control:
     - Change apache2-dev | libc6-dev build dependency back to apache2-dev
       only. Otherwise, apache2-dev is not installed at all, even though
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 0819822..5a3c7f3 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -870,7 +870,7 @@ bool SshMasterConnection::userChallengeAuth()
             x2goDebug<<"Prompt[0]: |"<<prompt<<"|"<<endl;
 #endif
             QString pr=prompt;
-            if(pr=="Password: ")
+            if(pr.startsWith ("Password:"))
             {
 #ifdef DEBUG
                 x2goDebug<<"Password request"<<endl;
@@ -885,7 +885,7 @@ bool SshMasterConnection::userChallengeAuth()
             for (std::size_t i = 0; i < challenge_auth_code_prompts_size; ++i) {
                 x2goDebug << "Checking against known prompt #" << i << ": " << challenge_auth_code_prompts_[i] << endl;
 
-                if (pr == challenge_auth_code_prompts_[i]) {
+                if (pr.startsWith (challenge_auth_code_prompts_[i])) {
                     has_challenge_auth_code_prompt = true;
                     break;
                 }

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git