This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 0a40c9071294d09aec6ab78d65926fd414231d42 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Wed Jun 19 09:24:15 2019 +0200 If using x2go broker and ssh proxy check for the option "usebrokeruserforproxy" in the session file. If it's "true", use the same username for the proxy as broker login. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index dd113a6..b9e5f6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium - Direct RDP sesion send to broker event CONNECTED instead of CONNECTING at start of RDP client. - Fixing setting correct session command when resuming the session. - Don't exit if sending event to http broker has failed. + - If using x2go broker and ssh proxy check for the option "usebrokeruserforproxy" in the session + file. If it's "true", use the same username for the proxy as broker login. [ Mihai Moldovan ] * New upstream version (4.1.2.2): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index cd97e6c..77652b7 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -3803,11 +3803,19 @@ bool ONMainWindow::startSession ( const QString& sid ) { bool ok; bool useBrokerPassForProxy=false; + bool useBrokerUserForProxy=false; if(brokerMode) { useBrokerPassForProxy=(st->setting()->value ( - sid+"/usebrokerpassforproxy", false - ).toBool() ); + sid+"/usebrokerpassforproxy", false + ).toBool() ); + useBrokerUserForProxy=(st->setting()->value ( + sid+"/usebrokeruserforproxy", false + ).toBool() ); + if(useBrokerUserForProxy) + { + proxylogin=config.brokerUser; + } } if(useBrokerPassForProxy) proxypassword=config.brokerPass; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git