The branch, master has been updated via b002295e8bf2023d7c97ce990f4c42514eb56cbd (commit) from 973b9ace780d34bc97a2f6b9e5d2d618f9a41ad4 (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 ----------------------------------------------------------------- commit b002295e8bf2023d7c97ce990f4c42514eb56cbd Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Sep 25 11:16:34 2013 +0200 New broker session profile parameter: broker-agent-query-mode. Define agent query methods per session profile. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2gobroker/brokers/base_broker.py | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 047e26b..26a2140 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low allow taking command-line options into account. - Modify default x2gobroker-sessionprofiles.conf and provide something that will work with every default setup. + - New broker session profile parameter: broker-agent-query-mode. Define + agent query methods per session profile. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * /debian/x2gobroker-agent.dirs: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 5d4ada9..70242d2 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -473,7 +473,12 @@ class X2GoBroker(object): """ _default_agent_query_mode = "LOCAL" _agent_query_mode = "" - if self.config.has_value(self.backend_name, 'agent-query-mode') and self.config.get_value(self.backend_name, 'agent-query-mode'): + + if _profile and _profile.has_key(u'broker-agent-query-mode') and _profile['broker-agent-query-mode']: + _agent_query_mode = _profile[u'broker-agent-query-mode'] + logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): found broker-agent-query-mode in session profile with ID {id}: {value}. This one has precendence over the default and the backend value.'.format(id=profile_id, value=_authorized_keys_file)) + + elif self.config.has_value(self.backend_name, 'agent-query-mode') and self.config.get_value(self.backend_name, 'agent-query-mode'): _agent_query_mode = self.config.get_value(self.backend_name, 'agent-query-mode').lower() logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): found agent-query-mode in backend config section »{backend}«: {value}. This one has precendence over the default value.'.format(backend=self.backend_name, value=_agent_query_mode)) 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).