This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit 7b83af9ccbccaa1a680438b49cfd35848fd383fd
Author: Oleksandr Shneyder <o.shney...@phoca-gmbh.de>
Date: Fri Oct 20 13:13:31 2017 +0200
Add session config file option "sshproxysamekey". With this option client
will use for proxy authentication same key as for X2Go server. This is
important in first case for broker users, where key can be generated "on the
fly". Maybe it makes sence to add this option in UI and command line later.
---
debian/changelog | 5 +++++
src/onmainwindow.cpp | 9 ++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 019bf14..9580085 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -256,6 +256,11 @@ x2goclient (4.1.1.0-0x2go1) UNRELEASED; urgency=medium
when sound is enabled. Show warning if PulseAudio not running
and disable the sound support for the session to avoid
session freezes.
+ - Add session config file option "sshproxysamekey". With this option
+ client will use for proxy authentication same key as for X2Go server.
+ This is important in first case for broker users, where key can be
+ generated "on the fly". Maybe it makes sence to add this option in UI
+ and command line later.
[ Robert Parts ]
* New upstream version (4.1.1.0):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index e1da2c8..0eae842 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -3865,11 +3865,18 @@ bool ONMainWindow::startSession ( const QString& sid )
sid+"/sshproxysameuser",
false
).toBool() );
-
+ bool proxySameKey=(st->setting()->value (
+ sid+"/sshproxysamekey",
+ false
+ ).toBool() );
if(proxyKey.length()<=0 && proxyType==SshMasterConnection::PROXYSSH)
{
proxyKey=findSshKeyForServer(proxylogin, proxyserver,
QString::number(proxyport));
}
+ if(proxySameKey)
+ {
+ proxyKey=currentKey;
+ }
if(proxySameUser)
proxylogin=user;
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
