The branch, master has been updated via f8bc4fb12f919a61890fa722489b139a2d0afbed (commit) from 9c5804a4478c5815c639a8984789bd252a966e90 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f8bc4fb12f919a61890fa722489b139a2d0afbed Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 28 17:57:26 2013 +0100 Update man page: Add broker relevant cmdline options. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + man/man1/x2goclient.1 | 30 ++++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 40aed12..8cabebc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.1.0): - Fix position shifts of broker login widget on repetetive authentication failures. (Fixes: #71). + - Update man page: Add broker relevant cmdline options. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 30 Dec 2012 15:41:04 +0100 diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1 index bedddfb..4bbe926 100644 --- a/man/man1/x2goclient.1 +++ b/man/man1/x2goclient.1 @@ -100,8 +100,34 @@ Add DSA/RSA host key fingerprint to .ssh/known_hosts in case of "authenticity of \*(T<\fB\-\-read-exports-from\fR\*(T> Specifies a directory where some external mechanism (e.g. script) can notify \fBx2goclient\fR on new block devices (CD/DVDs, USB sticks, etc.). -.SH LDAP OPTIONS -In case you want to provide \fBx2goclient\fR session profiles from LDAP use the following options: +.SH BROKER OPTIONS +In case you want to retrieve \fBx2goclient\fR session profiles from an X2Go Session Broker use the following options: +.TP +\*(T<\fB\-\-broker-url=<URL>\fR\*(T> +Specify the <URL> of the X2Go Session Broker. X2Go Client can access http:// and ssh:// style URLs. +.TP +\*(T<\fB\-\-broker-noauth\fR\*(T> +The X2Go Session Broker is accessible without authentication. +.TP +\*(T<\fB\-\-auth-id=<USERNAME>\fR\*(T> +Use this <USERNAME> for authenticating against the X2Go Session Broker. This option mostly makes sense together +with \fI--broker-autologin\fR or \fI--broker-ssh-key\fR. +.TP +\*(T<\fB\-\-broker-autologin\fR\*(T> +For SSH based X2Go Session Brokers. If an SSH agent is available or default key files exist then +try those for authentication against the X2Go Session Broker. +.TP +\*(T<\fB\-\-broker-ssh-key=<SSHPRIVKEY>\fR\*(T> +For SSH based X2Go Session Brokers. Full path to a valid SSH private key file. +.TP +\*(T<\fB\-\-broker-name=<NAME>\fR\*(T> +Currently unused... + +.SH LDAP OPTIONS (deprecated) +NOTE: LDAP support won't be continued in X2Go Client 2 (next generation of X2Go Client). The LDAP +functionality already is fully available via the X2Go Session Brokerage feature. +.PP +In case you want to retrieve \fBx2goclient\fR session profiles from an LDAP server use the following options: .TP \*(T<\fB\-\-ldap\fR\*(T> Start with LDAP support (disabled by default). hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).