This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit 42f20456d2ddec6b81507ea3749295b411fda69f Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 13 01:05:03 2015 +0100 onmainwindow.cpp: on OS X, specify sshd's PID file location in its server config. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 3 +++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0554cd5..12490a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -231,6 +231,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low - onmainwindow.cpp: prettify non-available host key error message. - onmainwindow.cpp: also use usermode sshd on OS X, if no global daemon is running. + - onmainwindow.cpp: on OS X, specify sshd's PID file location in its + server config. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 7036c3e..7fc8480 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -9884,8 +9884,10 @@ void ONMainWindow::slotSetWinServersReady() void ONMainWindow::generateEtcFiles() { QString etcDir=homeDir+"/.x2go/etc"; + QString varDir = homeDir + "/.x2go/var"; QDir dr ( homeDir ); dr.mkpath ( etcDir ); + dr.mkpath (varDir); QFile file ( etcDir +"/sshd_config" ); if ( !file.open ( QIODevice::WriteOnly | QIODevice::Text ) ) return; @@ -9896,6 +9898,7 @@ void ONMainWindow::generateEtcFiles() QTextStream out ( &file ); out<<"StrictModes no\n"<< "UsePrivilegeSeparation no\n"<< + "PidFile " + varDir + "/sshd.pid\n" << #ifdef Q_OS_WIN "Subsystem shell "<< wapiShortFileName ( appDir) +"/sh"+"\n"<< "Subsystem sftp "<< wapiShortFileName ( appDir) +"/sftp-server"+"\n"<< -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git