This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 04e5defd3089db9075501a99624f64c9926bedb5 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Apr 1 06:12:02 2015 +0200 Don't enforce agent query mode "SSH" for x2gobroker-ssh anymore. --- debian/changelog | 1 + x2gobroker/brokers/base_broker.py | 3 +-- x2gobroker/client/plain.py | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3bab090..b75b4c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -293,6 +293,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - X2GoBroker.get_agent_query_mode(): Immediately return overridden query mode. Avoid logging of the configured query mode. Write the overridden query mode to the logger instance instead. + - Don't enforce agent query mode "SSH" for x2gobroker-ssh anymore. * 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 d972f28..fa89ccd 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -523,8 +523,7 @@ class X2GoBroker(object): def _enforce_agent_query_mode(self, mode=u'LOCAL'): """\ - Allow frontends (like the SSH client frontend) to enforce - a certain broker agent backend. + Allow frontends to enforce a certain broker agent backend. @param mode: what agent query mode demanded @type mode: C{unicode} diff --git a/x2gobroker/client/plain.py b/x2gobroker/client/plain.py index d4cfd9c..9e4d7d1 100644 --- a/x2gobroker/client/plain.py +++ b/x2gobroker/client/plain.py @@ -30,12 +30,6 @@ from x2gobroker.loggers import logger_broker def _override_do_authenticate(username='', password=''): return True -def _enforce_agent_query_mode(mode=u'LOCAL'): - if mode == u'LOCAL': - return u'SSH' - else: - return None - class X2GoBrokerClient(object): def get(self, args): @@ -72,7 +66,6 @@ class X2GoBrokerClient(object): output = '' broker_backend._do_authenticate = _override_do_authenticate - broker_backend._enforce_agent_query_mode = _enforce_agent_query_mode access, next_cookie = broker_backend.check_access(username=username, ip=ip, cookie=cookie, override_password_auth=True) if access: -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git