[X2Go-Commits] [x2goclient] 01/01: Prevent passwordless re-logins into X2Go Session Broker if --broker-autologoff is used on the cmdline. (Fixes: #782).
git-admin at x2go.org
git-admin at x2go.org
Fri Feb 6 12:35:01 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit 3f85fe2186e8d06f8b92eb9b80a9b26ad6da836f
Author: Sergey_Savko <savko at tophouse.ru>
Date: Fri Feb 6 13:30:33 2015 +0300
Prevent passwordless re-logins into X2Go Session Broker if --broker-autologoff is used on the cmdline. (Fixes: #782).
---
debian/changelog | 5 +++++
httpbrokerclient.cpp | 4 ++++
2 files changed, 9 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index afd5bf9..c6fe947 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,11 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
* x2goclient.spec:
- Always set BuildRoot: parameter.
+ [ Sergey Savko ]
+ * 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).
+
[ Heinrich Schuchardt ]
* New upstream release (4.0.3.2):
- Base the layout dialogue "Session ID" (which shows up when starting a
diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp
index 5f009d4..5780cca 100644
--- a/httpbrokerclient.cpp
+++ b/httpbrokerclient.cpp
@@ -242,6 +242,10 @@ void HttpBrokerClient::slotSshUserAuthError(QString error)
void HttpBrokerClient::getUserSessions()
{
QString brokerUser=config->brokerUser;
+ // Otherwise, after logout from the session, we will be connected by a previous user without a password by authid.
+ if (config->brokerAutologoff) {
+ nextAuthId=config->brokerUserId;
+ }
x2goDebug<<"called getUserSessions: brokeruser: "<<brokerUser<<" authid: "<<nextAuthId;
if(mainWindow->getUsePGPCard())
brokerUser=mainWindow->getCardLogin();
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list