This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from 08e7b17 improve functionality of defaults.conf file new 01ba39f Fix IPv6 binding of the X2Go Session Broker daemon. If no bind port is given via the cmdline, obtain it from other means (via x2gobroker.defaults). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: bin/x2gobroker | 15 +++++++++++---- debian/changelog | 3 +++ 2 files changed, 14 insertions(+), 4 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 01ba39f70e1f01638b04f20a3752eab9e4a6b267 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jul 7 00:05:11 2014 +0200 Fix IPv6 binding of the X2Go Session Broker daemon. If no bind port is given via the cmdline, obtain it from other means (via x2gobroker.defaults). --- bin/x2gobroker | 15 +++++++++++---- debian/changelog | 3 +++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/bin/x2gobroker b/bin/x2gobroker index 12e34bc..034f780 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -76,8 +76,8 @@ def logfile_prelude(mode='HTTP'): logger_broker.info(' X2GOBROKER_CONFIG: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_CONFIG)) logger_broker.info(' X2GOBROKER_AGENT_CMD: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_AGENT_CMD)) logger_broker.info(' X2GOBROKER_DEFAULT_BACKEND: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND)) - if mode != 'SSH': + logger_broker.info(' DAEMON_BIND_ADDRESS: {value}'.format(value=cmdline_args.bind)) logger_broker.info(' X2GOBROKER_AUTHSERVICE_SOCKET: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_AUTHSERVICE_SOCKET)) logger_broker.info(' X2GOBROKER_SSL_CERTFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE)) logger_broker.info(' X2GOBROKER_SSL_KEYFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE)) @@ -204,7 +204,8 @@ if __name__ == "__main__": logger_broker.warn(' better run as user {daemon_username}.'.format(daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) logger_broker.warn('Automatically switching to DEBUG mode due to interactive launch of this application.') x2gobroker.defaults.X2GOBROKER_DEBUG = True - if cmdline_args.bind is None: cmdline_args.bind = '127.0.0.1:8080' + if cmdline_args.bind is None: + cmdline_args.bind = x2gobroker.defaults.DAEMON_BIND_ADDRESS if cmdline_args.user: logger_broker.warn('ignoring non-valid option --user for broker mode HTTP...') if cmdline_args.auth_cookie: logger_broker.warn('ignoring non-valid option --auth-cookie for broker mode HTTP...') if cmdline_args.task: logger_broker.warn('ignoring non-valid option --task for broker mode HTTP...') @@ -244,11 +245,17 @@ if __name__ == "__main__": cmdline_args.bind = cmdline_args.bind.lstrip(':') if ':' in cmdline_args.bind: - bind_address, bind_port = cmdline_args.bind.split(':')[0:2] - bind_port = int(bind_port) + bind_address, bind_port = cmdline_args.bind.rsplit(':', 1) + try: + bind_port = int(bind_port) + except TypeError: + # obviously we split an IPv6 address + bind_address = cmdline_args.bind + bind_port = 22 else: bind_address = None bind_port = int(cmdline_args.bind) + bind_address = bind_address.lstrip('[').rstrip(']') urls = () settings = {} diff --git a/debian/changelog b/debian/changelog index 1d8cd86..10a186f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -142,6 +142,9 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low (Fixes: #493). - Provide autologin support for session profiles that have an SSH proxy host configured. (Fixes: #494). + - Fix IPv6 binding of the X2Go Session Broker daemon. If no bind port + is given via the cmdline, obtain it from other means (via + x2gobroker.defaults). * debian/control: + Provide separate bin:package for SSH brokerage: x2gobroker-ssh. + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
-
git-admin＠x2go.org