[X2Go-Commits] [x2goclient] 242/257: src/onmainwindow.cpp: add comment to last all-in listening check in startSshd ().
git-admin at x2go.org
git-admin at x2go.org
Mon Nov 28 16:06:31 CET 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit d7ce9fa08d7888e6df4cd7f079a6e93f462e8f81
Author: Mihai Moldovan <ionic at ionic.de>
Date: Wed Oct 26 17:58:27 2016 +0200
src/onmainwindow.cpp: add comment to last all-in listening check in startSshd ().
---
debian/changelog | 2 ++
src/onmainwindow.cpp | 1 +
2 files changed, 3 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 47427d1..ba20f6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -433,6 +433,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
- src/onmainwindow.cpp: move QProcess startup check in startSshd () to
non-Windows code section and add a listening socket check loop. Windows
uses other means of starting the daemon.
+ - src/onmainwindow.cpp: add comment to last all-in listening check in
+ startSshd ().
[ Bernard Cafarelli ]
* New upstream version (4.0.5.3):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 8b2ece4..9afd46a 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10588,6 +10588,7 @@ bool ONMainWindow::startSshd()
}
#endif /* defined (Q_OS_WIN) */
+ /* Check to see if connecting to the listening socket works. */
if (!isServerRunning (clientSshPort.toInt ())) {
printSshDError_startupFailure ();
x2goDebug << "Failed to start user mode OpenSSH server.";
--
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