[X2Go-Commits] [x2gobroker] 02/05: x2gobroker-testauth: Don't use hard-coded default backend. Obtain X2GOBROKER_DEFAULT_BACKEND from x2gobroker.defaults instead.
git-admin at x2go.org
git-admin at x2go.org
Thu Oct 30 06:17:37 CET 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gobroker.
commit 0367822deea6015116f00c136888046ff7c0f9cd
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Oct 30 05:34:22 2014 +0100
x2gobroker-testauth: Don't use hard-coded default backend. Obtain X2GOBROKER_DEFAULT_BACKEND from x2gobroker.defaults instead.
---
bin/x2gobroker-testauth | 2 +-
debian/changelog | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/bin/x2gobroker-testauth b/bin/x2gobroker-testauth
index fd844d9..7e264f1 100755
--- a/bin/x2gobroker-testauth
+++ b/bin/x2gobroker-testauth
@@ -51,7 +51,7 @@ if __name__ == "__main__":
]
misc_options = [
{'args':['-C','--config-file'], 'default': None, 'metavar': 'CONFIG_FILE', 'help': 'Specify a special configuration file name, default is: {default}'.format(default=x2gobroker.defaults.X2GOBROKER_CONFIG), },
- {'args':['-b','--backend'], 'default': 'zeroconf', 'metavar': 'BACKEND', 'help': 'Use this specific backend for testing authentication, see x2gobroker.conf for a list of configured and enabled backends', },
+ {'args':['-b','--backend'], 'default': x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND, 'metavar': 'BACKEND', 'help': 'Use this specific backend for testing authentication, see x2gobroker.conf for a list of configured and enabled backends', },
{'args':['-d','--debug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code', },
]
p = argparse.ArgumentParser(description='X2Go Session Broker (Authentication Test Utility)',\
diff --git a/debian/changelog b/debian/changelog
index 22e0cfd..4768c6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -179,6 +179,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
loggers.
- Provide a special PAM configuration file for SUSE systems
(identical to the PAM configuration file for Debian).
+ - x2gobroker-testauth: Don't use hard-coded default backend. Obtain
+ X2GOBROKER_DEFAULT_BACKEND from x2gobroker.defaults instead.
* 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
More information about the x2go-commits
mailing list