[X2Go-Commits] [x2goclient] 01/04: src/onmainwindow.cpp: add -nopn parameter to VcXsrv startup options, making the binary fail if it wasn't able to bind the requested port on all addresses.
git-admin at x2go.org
git-admin at x2go.org
Sat May 12 00:38:12 CEST 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit 688a221996b8a6c900c4ad751fdce1881070567b
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri May 11 23:15:55 2018 +0200
src/onmainwindow.cpp: add -nopn parameter to VcXsrv startup options, making the binary fail if it wasn't able to bind the requested port on all addresses.
---
debian/changelog | 3 +++
src/onmainwindow.cpp | 11 +++++++++++
2 files changed, 14 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 14b3290..b1b6318 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,9 @@ x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium
references.
- src/editconnectiondialog.cpp: do not connect signals to slots that do
not exist on non-Linux platforms.
+ - src/onmainwindow.cpp: add -nopn parameter to VcXsrv startup options,
+ making the binary fail if it wasn't able to bind the requested port on
+ all addresses.
* x2goclient.spec:
- Remove plugin references.
* debian/rules:
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 61641ff..bef04f5 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10001,6 +10001,17 @@ void ONMainWindow::startXOrg ()
{
args<< option;
}
+
+ if (useInternalX) {
+ /*
+ * -nopn lets the server terminate if it couldn't bind on all interfaces.
+ * Only VcXsrv supports this option, though, and we don't want have external
+ * X servers fail to start due to unknown options, so only add the option
+ * if using the internal X server and the internal copy is VcXsrv-based.
+ */
+ args << "-nopn";
+ }
+
args<<dispString;
}
//#endif
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list