This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit f2cb22f54241117258fa4c01649d88759fc9573f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 13 12:45:38 2015 +0200 Implement "not-set" value for X2Go Client parameters. If a parameter is set to "not-set", the parameter won't be handed over to X2Go Client. (Fixes: #836). --- debian/changelog | 3 +++ x2gobroker/brokers/base_broker.py | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 61bc3c9..4ea77f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -319,6 +319,9 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low $SSH_ORIGINAL_COMMAND environment var, make sure to strip-off "sh -c" from the command's beginning. - x2gobroker-agent.pl: Fix detection of X2Go's library path (x2gopath lib). + - Implement "not-set" value for X2Go Client parameters. If a parameter + is set to "not-set", the parameter won't be handed over to X2Go Client. + (Fixes: #836). * 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 6b10c78..d613109 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -1206,6 +1206,7 @@ class X2GoBroker(object): - drop internal host=<hostname> and sshport=<port> keys from the profile, broker clients cannot handle those + - drop keys with value "not-set" - replace BROKER_USER by the name of the authenticated user - test if autologin is possible - fix rootless session profile option for non-desktop sessions @@ -1230,7 +1231,7 @@ class X2GoBroker(object): acls = self.get_profile_acls(profile_id) if self.check_profile_acls(username, acls): - for key in profile.keys(): + for key in copy.deepcopy(profile).keys(): if key.startswith('host=') and broker_frontend != 'uccs': del profile[key] if key.startswith('sshport=') and broker_frontend != 'uccs': @@ -1238,6 +1239,9 @@ class X2GoBroker(object): if key == 'user' and profile[key] == 'BROKER_USER': profile[key] = unicode(username) + if profile[key] = "not-set": + del profile[key] + if self.get_session_autologin(profile_id): profile['autologin'] = True profile['key'] = u'<will-be-exchanged-during-session-selection>' -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git