This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 886768adfb703f41270098a7593d418ea08bbf89 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Sep 11 14:17:22 2014 +0200 Make sure bind_address and bind_port are correctly detected from /etc/default/x2gobroker-daemon and /etc/x2go/broker/defaults.cfg. --- bin/x2gobroker | 5 +++-- debian/changelog | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/x2gobroker b/bin/x2gobroker index 034f780..12ea764 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -253,9 +253,10 @@ if __name__ == "__main__": bind_address = cmdline_args.bind bind_port = 22 else: - bind_address = None + bind_address = "0.0.0.0" bind_port = int(cmdline_args.bind) - bind_address = bind_address.lstrip('[').rstrip(']') + bind_address = bind_address.lstrip('[').rstrip(']') + cmdline_args.bind = "[{address}]:{port}".format(address=bind_address, port=bind_port) urls = () settings = {} diff --git a/debian/changelog b/debian/changelog index 91ef098..141d2ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -148,6 +148,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Rename LICENSE file to COPYING. - X2Go Broker Agent: Test if queried username exists on the system before performing the query. + - Make sure bind_address and bind_port are correctly detected from + /etc/default/x2gobroker-daemon and /etc/x2go/broker/defaults.cfg. * 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