This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit bb0e88d8a129bce0678afd6c327c8fcf5372a770 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jan 1 06:02:37 2018 +0100 x2goserver-common/etc/x2goserver.conf: add x2goagent.port_randomization configuration option. Can be set to either "host-based" or "pure-random". Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 3 +++ x2goserver-common/etc/x2goserver.conf | 17 +++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1a41d48..1cee1e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -265,6 +265,9 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium problem that required this workaround has been fixed a long time ago. - x2goserver/lib: new wrapper script x2goqueryconfig to fetch a config value out of the global x2goserver.conf file. + - x2goserver/etc/x2goserver.conf: add x2goagent.port_randomization + configuration option. Can be set to either "host-based" or + "pure-random". * x2goserver.spec: - RPMify x2goserver-xsession description. - Remove qt4 stuff, we're not using the framework here. diff --git a/x2goserver-common/etc/x2goserver.conf b/x2goserver-common/etc/x2goserver.conf index 51e4704..fe20cf0 100644 --- a/x2goserver-common/etc/x2goserver.conf +++ b/x2goserver-common/etc/x2goserver.conf @@ -30,6 +30,23 @@ enable=no # and X2Go Server enable=no +[x2goagent] +# Value can be either "host-based" or "pure-random". +# This is currently a workaround for a bug in X2Go Client, that uses a 1:1 +# mapping of source to destination ports for SSH tunnels. +# This leads to problems if opening two (or more) instances of X2Go Client +# and connecting to two machines that use the same tunneling ports. +# Such a scenario is easy to trigger: make sure that both machines have run +# no active sessions, than spawn one session on each machine. +# Connecting to both at the same time will not be possible without a means +# of randomization. +# The randomization can either be "host-based", in which case the port will +# be set to 30000 + (128 * last octet of IPv4 address) and does the job if +# the last octet of the machine's IPv4 address is known to be unique, or +# "pure-random" which uses the (not so truly random) bash ${RANDOM} +# variable to fully randomize the port, i.e., 30000 + random(0..32767). +port_randomization="pure-random" + [log] # possible levels are: emerg, alert, crit, err, warning, notice, info, debug loglevel=notice -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git