[X2Go-Commits] [x2goclient] 01/01: onmainwindow.cpp: include sshd PID file path option in quotes to support whitespaces within the var directory path on Windows.

git-admin at x2go.org git-admin at x2go.org
Wed Aug 12 01:51:40 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 3030896faf08f903b1ff3d7d0f83b8bc1d605abc
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Aug 12 01:50:24 2015 +0200

    onmainwindow.cpp: include sshd PID file path option in quotes to support whitespaces within the var directory path on Windows.
    
    Add comment to revisit this later on non-Windows-platforms, too.
    
    Fixes: #916.
---
 debian/changelog     |    6 +++++-
 src/onmainwindow.cpp |    3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b07b21..2ca14b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
 
-  * Continue development
+  [ Mihai Moldovan ]
+  * New upstream release (4.0.5.1):
+    - onmainwindow.cpp: include sshd PID file path option in quotes to support
+      whitespaces within the var directory path on Windows. Add comment to
+      revisit this later on non-Windows-platforms, too. Fixes: #916.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 28 Jul 2015 06:05:27 +0200
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 468855b..30b5a10 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -9994,12 +9994,13 @@ void ONMainWindow::generateEtcFiles()
     QTextStream out ( &file );
     out<<"StrictModes no\n"<<
        "UsePrivilegeSeparation no\n"<<
-       "PidFile " + varDir + "/sshd.pid\n" <<
+       "PidFile \"" + varDir + "/sshd.pid\"\n" <<
 #ifdef Q_OS_WIN
        "Subsystem shell "<< wapiShortFileName ( appDir) +"/sh"+"\n"<<
        "Subsystem sftp "<< wapiShortFileName ( appDir) +"/sftp-server"+"\n"<<
        "AuthorizedKeysFile \""<<authKeyPath<<"\"";
 #else
+      /* This may need some sanitization, i.e., appDir could potentially include whitespace. */
        "Subsystem sftp "
        <<appDir<<"/sftp-server\n";
 #endif

--
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