This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 58e4845eb5ccb9ce9d3baca75698c91f7e71377d Author: Sergey_Savko <savko@tophouse.ru> Date: Fri Feb 6 14:15:53 2015 +0300 Add new cmdline option --broker-noauth-use-session-username. When --broker-noauth is used, the broker does not know on behalf of which user to operate. This new option enables username syncing. When logging into X2Go Server, that username will be sent to the broker and be used for querying X2Go Broker Agents etc. (Fixes: #781). --- debian/changelog | 5 +++++ man/man1/x2goclient.1 | 3 +++ onmainwindow.cpp | 10 ++++++++++ onmainwindow.h | 1 + 4 files changed, 19 insertions(+) diff --git a/debian/changelog b/debian/changelog index c6fe947..c40f3ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,11 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium * New upstream release (4.0.3.2): - Prevent passwordless re-logins into X2Go Session Broker if --broker-autologoff is used on the cmdline. (Fixes: #782). + - Add new cmdline option --broker-noauth-use-session-username. + When --broker-noauth is used, the broker does not know on behalf + of which user to operate. This new option enables username syncing. + When logging into X2Go Server, that username will be sent to the + broker and be used for querying X2Go Broker Agents etc. (Fixes: #781). [ Heinrich Schuchardt ] * New upstream release (4.0.3.2): diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1 index d785e9a..c2e5ff4 100644 --- a/man/man1/x2goclient.1 +++ b/man/man1/x2goclient.1 @@ -261,6 +261,9 @@ Run a connectivity test against X2Go Session Broker. Not supported by all broker .TP \*(T<\fB\-\-change-broker-pass\fR\*(T> Send a change-password request to an X2Go Session Broker. Not supported by all broker implementations. +.TP +\*(T<\fB\-\-broker-noauth-with-session-username\fR\*(T> +Informs the broker to use the username you entered for X2Go Server authentication when selecting a server/session. Only has functionality if --broker-noauth is used. .SH LDAP OPTIONS (deprecated) NOTE: LDAP support won't be continued in X2Go Client 2 (next generation of X2Go Client). diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 5c346e6..6dadd87 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -71,6 +71,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) startHidden=false; keepTrayIcon=false; hideFolderSharing=false; + brokerNoauthWithSessionUsername=false; thinMode=false; closeDisconnect=false; showHaltBtn=false; @@ -3031,6 +3032,9 @@ void ONMainWindow::slotSessEnter() if(brokerMode) { + if (config.brokerNoAuth && brokerNoauthWithSessionUsername) { + config.brokerUser = login->text(); + } broker->selectUserSession(sessionExplorer->getLastSession()->id()); config.session=sessionExplorer->getLastSession()->id(); setStatStatus ( tr ( "Connecting to broker" ) ); @@ -6662,6 +6666,12 @@ bool ONMainWindow::parseParameter ( QString param ) return true; } + if ( param=="--broker-noauth-with-session-username" ) + { + brokerNoauthWithSessionUsername=true; + return true; + } + //force to show trayicon if (param == "--tray-icon") { diff --git a/onmainwindow.h b/onmainwindow.h index 1498e16..57ad65b 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -592,6 +592,7 @@ private: bool startHidden; bool keepTrayIcon; bool hideFolderSharing; + bool brokerNoauthWithSessionUsername; bool defaultUseSound; bool defaultXinerama; bool cardStarted; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git