This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/help-cmd in repository x2goclient. commit d80caf9d37bf6063c7c174eef0327afc5a5f5fc5 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Apr 22 10:26:29 2015 +0200 help.cpp: document broker options. Fixes: #851. --- debian/changelog | 1 + src/help.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4be5e47..9f826ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -265,6 +265,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low systems. - help.cpp: complete pretty printer function. - help.cpp: "copy" old command line parameters. + - help.cpp: document broker options. Fixes: #851. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/help.cpp b/src/help.cpp index 44a2f41..3930560 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -128,6 +128,11 @@ help::params_t help::build_params () { ADD_OPT ("--tray-icon", "Force-enables session system tray icon."); ADD_OPT ("--close-disconnect", "Automatically closes X2Go Client after a disconnect."); ADD_OPT ("--hide-foldersharing", "Hides all Folder-Sharing-related options."); + ADD_OPT ("--broker-name=<name>", "Sets the broker name to display in X2Go Client. This parameter is optional."); + ADD_OPT ("--broker-url=<protocol>://[username@]<host>[:port]/path", "Sets the URL of the session broker. \"protocol\" must be one of \"http\", \"https\" or \"ssh\". If \"username@\" is provided, it will be pasted into the authorization dialog of X2Go Client. URL examples are: https://x2gobroker.org/cgi-bin/x2gobroker.cgi, ssh://user@x2gobroker.org:22/usr/lib/x2go/x2gobroker.pl"); + ADD_OPT ("--broker-ssh-key=<path to key>", "Sets the path to an SSH key to use for authentication against an SSH session broker. The client's behavior is undefined if this flag is used for non-SSH session brokers."); + ADD_OPT ("--broker-autologin", "Enables the use of the default SSH key or SSH agent for authentication against an SSH session broker. The client's behavior is undefined if this flag is used for non-SSH session brokers."); + ADD_OPT ("--broker-noauth", "Does not ask for user credentials during session broker authentication. This can be useful if you are using an HTTP(S) session broker without authentication. If you run an HTTP(S) server without authentication, but with user-specific profiles, then put the user name into the broker URL (refer to --broker-url.) The user name then will be extracted from the broker URL and be sent to the session broker. The client's behavior is undefined if this flag is used f [...] # undef ADD_OPT return (ret); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git