[X2Go-Commits] [x2gobroker] 03/03: During select_session: Re-add subdomain (if possible) to the hostname to make sure we can detect the host's <ip-address>:<port> further down in the code.

git-admin at x2go.org git-admin at x2go.org
Thu Nov 6 05:59:34 CET 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 72db45ff8f0678196d2aab0cb2180b23fe773b46
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Nov 6 05:59:10 2014 +0100

    During select_session: Re-add subdomain (if possible) to the hostname to make sure we can detect the host's <ip-address>:<port> further down in the code.
---
 debian/changelog                  |    3 +++
 x2gobroker/brokers/base_broker.py |    5 +++++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a99ddf0..4057286 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -192,6 +192,9 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
     - Add tests for broker agent queries.
     - Fix setting the remote agent's SSH port if the host option
       is of style "<hostname> (<ip-address>:<port>)".
+    - During select_session: Re-add subdomain (if possible) to the hostname to
+      make sure we can detect the host's <ip-address>:<port> further down in
+      the code.
   * debian/control:
     + Provide separate bin:package for SSH brokerage: x2gobroker-ssh.
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 3007351..fc5082c 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -1221,6 +1221,11 @@ class X2GoBroker(object):
 
                 server_name = busy_server_list[0][1]
 
+                # this makes sure we allow back-translation of hostname to host address
+                # when the format "<hostname> (<ip-address>)" ist used in the hosts field...
+                if len(subdomains_config) == 1:
+                    server_name += '.{domain}'.format(domain=subdomains_config[0])
+
             else:
                 logger_broker.warning('base_broker.X2GoBroker.select_session(): no broker agent could be contacted, this does not look good. We tried these agent hosts: {agent_hosts}'.format(agent_hosts=unicode(server_list)))
 

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git


More information about the x2go-commits mailing list