[X2Go-Commits] [x2goclient] 01/02: src/onmainwindow.cpp: wrap user name for client-side mounts in quotes. Fixes: #559.

[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 812753b3f1b6b31cf6391440b6768168e66bcbca
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Nov 14 01:30:01 2017 +0100

    src/onmainwindow.cpp: wrap user name for client-side mounts in quotes. Fixes: #559.
    
    Will fail with user names that contain quotes, but oh well...
---
 debian/changelog     | 3 +++
 src/onmainwindow.cpp | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index afc8103..ded9f24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,9 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium
     - src/sshmasterconnection.cpp: don't output an empty error message if
       password authencation has been requested but the server does not support
       this mechanism. Fixes: #408.
+    - src/onmainwindow.cpp: wrap user name for client-side mounts in quotes.
+      Fixes: #559. Will fail with user names that contain quotes, but oh
+      well...
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.1.1):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index bffb9ef..f1748fd 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -9995,11 +9995,11 @@ void ONMainWindow::startX2goMount()
         dirs=dirs+"__REVERSESSH_PORT__"+resumingSession.fsPort;
     }
     if ( !rem )
-        cmd="export HOSTNAME && x2gomountdirs dir "+sessionId+" "+cuser+
-            " "+dir->dstKey+" "+dirs;
+        cmd = "export HOSTNAME && x2gomountdirs dir " + sessionId + " \"" + cuser +
+              "\" " + dir->dstKey + " " + dirs;
     else
-        cmd="export HOSTNAME && x2gomountdirs rem "+sessionId+" "+cuser+
-            " "+dir->dstKey+" "+dirs;
+        cmd = "export HOSTNAME && x2gomountdirs rem " + sessionId + " \"" + cuser +
+              "\" " + dir->dstKey + " " + dirs;
 
 #ifdef Q_OS_WIN
 

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