The branch, tornado has been updated via 83b347f272687471a93d46449704893256ca88de (commit) from 1333f57a70b1c03a127d6995cdc0ddd171c19b84 (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 83b347f272687471a93d46449704893256ca88de Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Mar 6 00:19:03 2013 +0100 fix auth-mech and agent-query-mode detection ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 4f03e81..9001039 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -433,7 +433,7 @@ class X2GoBroker(object): _default_auth_mech = "pam" _auth_mech = "" - if self.config.has_value(self.backend_name, 'auth-mech'): + if self.config.has_value(self.backend_name, 'auth-mech') and self.config.get_value(self.backend_name, 'auth-mech'): _auth_mech = self.config.get_value(self.backend_name, 'auth-mech').lower() logger_broker.debug('base_broker.X2GoBroker.get_authentication_mechanism(): found auth-mech in backend config section »{backend}«: {value}. This one has precendence over the default value.'.format(backend=self.backend_name, value=_auth_mech)) @@ -454,7 +454,7 @@ class X2GoBroker(object): """ _default_agent_query_mode = "LOCAL" _agent_query_mode = "" - if self.config.has_value(self.backend_name, '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'): _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).