This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 52cdf02d3418c191a29218ebd8f5a52a1515b032 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jun 25 22:03:24 2018 +0200 src/onmainwindow.cpp: only add the StrictKeyModes sshd_config parameter when running on Windows. --- debian/changelog | 5 ++++- src/onmainwindow.cpp | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4036a56..3c6e677 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ x2goclient (4.1.2.1-0x2go1) UNRELEASED; urgency=medium - * Continue development + [ Mihai Moldovan ] + * New upstream version (4.1.2.1): + - src/onmainwindow.cpp: only add the StrictKeyModes sshd_config parameter + when running on Windows. -- X2Go Release Manager <git-admin@x2go.org> Sat, 23 Jun 2018 06:08:29 +0200 diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 48d5b6a..405b124 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -10420,7 +10420,9 @@ void ONMainWindow::generateEtcFiles() #endif /* defined (Q_OS_WIN) */ QTextStream out ( &file ); out<<"StrictModes no\n"<< +#ifdef Q_OS_WIN "StrictKeyModes no\n" << +#endif "UsePrivilegeSeparation no\n"<< "PidFile \"" + varDir + "/sshd.pid\"\n" << "AuthorizedKeysFile \"" << authKeyPath << "\"\n"; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git