[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.1-68-gd1bd661

[X2Go dev team]

The branch, master has been updated
       via  d1bd66113a64e188083f32ef00164c82be3d6e6d (commit)
      from  6f9ead7cf9184799f0b6ae9ff1efd0c7b879d0c6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d1bd66113a64e188083f32ef00164c82be3d6e6d
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Fri Dec 13 13:24:58 2013 +0100

    c121b7e2d3d83abdc2d7a29637bc3294e38b2ec3 broke checking if remote command produce only stderr and not stdout. It made x2goclient crash if x2gostartagent send LIMIT error. Current commit fixes this issue.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    3 +++
 sshprocess.cpp   |   17 +++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 9ddf90f..dad3af4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,6 +63,9 @@ x2goclient (4.0.1.2-0x2go2) UNRELEASED; urgency=low
     - Support for ChallengeResponseAuthentication (Google Authenticator)
     - Setting main window focus on mac (Fixes: #139).   
     - Additional check if authentication with GSSApi successfull 
+    - c121b7e2d3d83abdc2d7a29637bc3294e38b2ec3 broke checking if remote
+      command produce only stderr and not stdout. It made x2goclient crash
+      if x2gostartagent send LIMIT error. Current commit fixes this issue. 
 
   [ Heinrich Schuchardt ]
   * New upstream version (4.0.1.2):
diff --git a/sshprocess.cpp b/sshprocess.cpp
index 96d73e7..3aaad4b 100644
--- a/sshprocess.cpp
+++ b/sshprocess.cpp
@@ -276,7 +276,7 @@ void SshProcess::startTunnel(const QString& forwardHost, uint forwardPort, const
 #ifdef Q_OS_WIN
         QString sshString="plink -batch -P "+
 #else
-	        QString sshString=QString::null+"ssh"+ KEEPALIVE_OPTION +"-o GSSApiAuthentication=yes -o PasswordAuthentication=no -p "+
+        QString sshString=QString::null+"ssh"+ KEEPALIVE_OPTION +"-o GSSApiAuthentication=yes -o PasswordAuthentication=no -p "+
 #endif
                           QString::number(masterCon->getPort())+" "+
                           masterCon->getUser()+"@"+
@@ -374,7 +374,12 @@ void SshProcess::slotChannelClosed(SshProcess* creator, QString uuid)
     }
     else
     {
-        if ( stdOutString.length()<=0 &&  stdErrString.length() >0 )
+        QString begin_marker = "X2GODATABEGIN:"+uuid+"\n";
+        QString end_marker = "X2GODATAEND:"+uuid+"\n";
+        int output_begin=stdOutString.indexOf(begin_marker) + begin_marker.length();
+        int output_end=stdOutString.indexOf(end_marker);
+        output = stdOutString.mid(output_begin, output_end-output_begin);
+        if ( output.length()<=0 &&  stdErrString.length() >0 )
         {
             normalExited=false;
             output=stdErrString;
@@ -382,14 +387,6 @@ void SshProcess::slotChannelClosed(SshProcess* creator, QString uuid)
             x2goDebug<<"have only stderr, something must be wrong"<<endl;
 #endif
         }
-        else
-        {
-            QString begin_marker = "X2GODATABEGIN:"+uuid+"\n";
-            QString end_marker = "X2GODATAEND:"+uuid+"\n";
-            int output_begin=stdOutString.indexOf(begin_marker) + begin_marker.length();
-            int output_end=stdOutString.indexOf(end_marker);
-            output = stdOutString.mid(output_begin, output_end-output_begin);
-        }
     }
 #ifdef DEBUG
     x2goDebug<<"ssh finished:"<<normalExited<<" - "<<output<<uuid<<endl;


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).