[X2Go-Commits] x2gobroker.git - statusflag (branch) updated: 0.0.2.0-20-gf402675

[X2Go dev team]

The branch, statusflag has been updated
       via  f4026757bca650305a06382ca5521117ff82b4ee (commit)
      from  a8dbd6b888cf3b9321ecd42086defc68532e774f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 etc/broker/x2gobroker-sessionprofiles.conf |    5 +++--
 x2gobroker/brokers/base_broker.py          |    2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf
index 8d060ec..84bfc44 100644
--- a/etc/broker/x2gobroker-sessionprofiles.conf
+++ b/etc/broker/x2gobroker-sessionprofiles.conf
@@ -139,8 +139,9 @@ name=LXDE - srv-D
 command=LXDE
 acl-groups-allow=admins
 acl-groups-deny=ALL
-acl-clients-deny=ALL
-acl-clients-allow=admin-machine1.domain.local, admin-machine2.domain.local, admin-machine3.domain.local
+## make sure hostnames in client ACLs are resolvable via libnss!!!
+#acl-clients-deny=ALL
+#acl-clients-allow=admin-machine1.domain.local, admin-machine2.domain.local, admin-machine3.domain.local
 acl-any-order=deny-allow
 
 ##
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 2ce0ba4..590087a 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -336,6 +336,8 @@ class X2GoBroker(object):
                 _deny_address_set = netaddr.IPSet(_acls_clients_deny)
             except netaddr.core.AddrFormatError, e:
                 logger_error.error('base_broker.X2GoBroker.check_acls(): netaddr.core.AddrFormatError - {why}'.format(why=str(e)))
+            except ValueError, e:
+                logger_error.error('base_broker.X2GoBroker.check_acls(): ValueError - {why}'.format(why=str(e)))
 
             _allow_client = self._client_address in _allow_address_set
             _deny_client = self._client_address in _deny_address_set


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).