[X2Go-Commits] [x2goclient] 05/05: sshprocess.cpp: whitespace/prettify only and a compile fix.

git-admin at x2go.org git-admin at x2go.org
Thu Jun 11 04:23:22 CEST 2015


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

x2go pushed a commit to branch master
in repository x2goclient.

commit fadc7059aad55d70d1db2f0e382569bd61838588
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Jun 11 03:48:46 2015 +0200

    sshprocess.cpp: whitespace/prettify only and a compile fix.
---
 debian/changelog   |    1 +
 src/sshprocess.cpp |   16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 79ef02d..067c09b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,6 +62,7 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low
       raw output of SSH commands.
     - onmainwindow.cpp: remove now-bogus double quote escaping.
     - sshmasterconnection.cpp: port QProcess::start () change.
+    - sshprocess.cpp: whitespace/prettify only and a compile fix.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 26 May 2015 21:42:09 +0200
 
diff --git a/src/sshprocess.cpp b/src/sshprocess.cpp
index 271ef01..4866c2b 100644
--- a/src/sshprocess.cpp
+++ b/src/sshprocess.cpp
@@ -254,16 +254,16 @@ void SshProcess::startNormal(const QString& cmd)
         }
 
         /* Authentication options. */
-        local_args << "-o" << "GSSApiAuthentication=yes";
-        local_args << "-o" << "PasswordAuthentication=no";
-        local_args << "-o" << "PubkeyAuthentication=no";
+        local_args << "-o" << "GSSApiAuthentication=yes"
+                   << "-o" << "PasswordAuthentication=no"
+                   << "-o" << "PubkeyAuthentication=no";
 
         /* Port option. Must be the last one added! */
         local_args << "-p";
 #endif
-        local_args << QString::number (masterCon->getPort ());
-        local_args << "-l" << masterCon->getUser ();
-        local_args << host;
+        local_args << QString::number (masterCon->getPort ())
+                   << "-l" << masterCon->getUser ()
+                   << host;
 
         /* On Windows, arguments are automatically wrapped in double quotes.
          * This means we do not have to wrap shcmd ourselves.
@@ -274,8 +274,8 @@ void SshProcess::startNormal(const QString& cmd)
          */
         local_args << shcmd;
 
-        x2goDebug << "Invoking SSH command via SshProcess object " << pid<< ": "
-                  << local_cmd << local_args.join (" ");
+        x2goDebug << "Invoking SSH command via SshProcess object " << pid << ": "
+                  << local_cmd << " " << local_args.join (" ");
         procUuid=uuidStr;
         proc->start (local_cmd, local_args);
 

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


More information about the x2go-commits mailing list