--
Yours truly,
Sergey Savko.
From e49fc928e38aa9202f0c2bbb6e1a4481de9befc4 Mon Sep 17 00:00:00 2001
From: Sergey_Savko <[email protected]>
Date: Fri, 6 Feb 2015 14:15:53 +0300
Subject: [PATCH] x2goclient broker noauth patch
---
man/man1/x2goclient.1 | 3 +++
onmainwindow.cpp | 10 ++++++++++
onmainwindow.h | 1 +
3 files changed, 14 insertions(+)
diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1
index d785e9a..0bc4354 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 when authenticating.
.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..8bace07 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -71,6 +71,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
startHidden=false;
keepTrayIcon=false;
hideFolderSharing=false;
+ brokerNoauthWithSession=false;
thinMode=false;
closeDisconnect=false;
showHaltBtn=false;
@@ -3031,6 +3032,9 @@ void ONMainWindow::slotSessEnter()
if(brokerMode)
{
+ if (config.brokerNoAuth && brokerNoauthWithSession) {
+ config.brokerUser = login->text();
+ }
broker->selectUserSession(sessionExplorer->getLastSession()->id());
config.session=sessionExplorer->getLastSession()->id();
setStatStatus ( tr ( "Connecting to broker" ) );
@@ -6661,6 +6665,12 @@ bool ONMainWindow::parseParameter ( QString param )
config.brokerNoAuth=true;
return true;
}
+
+ if ( param=="--broker-noauth-with-session-username" )
+ {
+ brokerNoauthWithSession=true;
+ return true;
+ }
//force to show trayicon
if (param == "--tray-icon")
diff --git a/onmainwindow.h b/onmainwindow.h
index 1498e16..5a6dc0d 100644
--- a/onmainwindow.h
+++ b/onmainwindow.h
@@ -592,6 +592,7 @@ private:
bool startHidden;
bool keepTrayIcon;
bool hideFolderSharing;
+ bool brokerNoauthWithSession;
bool defaultUseSound;
bool defaultXinerama;
bool cardStarted;
--
1.7.10.4
_______________________________________________
x2go-dev mailing list
[email protected]
http://lists.x2go.org/listinfo/x2go-dev
