[X2go-Commits] x2goclient.git - release/4.0.0.x (branch) updated: 4.0.0.1-5-gcccfde9
X2Go dev team
git-admin at x2go.org
Mon Feb 11 11:24:18 CET 2013
The branch, release/4.0.0.x has been updated
via cccfde959d6792d5f142363ee2a12af51918c88d (commit)
from 1771a0cc49e5ec461c70611d7af94e0e8dda9632 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cccfde959d6792d5f142363ee2a12af51918c88d
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date: Wed Jan 30 14:43:21 2013 +0100
support for session key "usebrokerpassforproxy" - use broker pass for authentication on proxy
Conflicts (resolved by Mike Gabriel):
debian/changelog
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 4 ++--
onmainwindow.cpp | 14 ++++++++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 7199196..a79ca56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,8 @@ x2goclient (4.0.0.2-0~x2go1) UNRELEASED; urgency=low
* New upstream version (4.0.0.2):
- Fix support for RSA Keys in X2Go Broker code.
- Set autologin as false by default. Quote session ID in SSH broker code
- - support for session key "usebrokerpassforproxy" - use broker pass for
- authentication on proxy
+ - Support for session key "usebrokerpassforproxy" - use broker pass for
+ authentication on proxy.
- Fix X2Go Logo.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sun, 30 Dec 2012 15:41:04 +0100
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index d6fece0..24cdb2a 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -3340,8 +3340,18 @@ bool ONMainWindow::startSession ( const QString& sid )
if(useproxy && !proxyAutologin && proxyKey.length()<=0)
{
bool ok;
- proxypassword=QInputDialog::getText(0,proxylogin+"@"+proxyserver+":"+QString::number(proxyport),
- tr("Enter password for SSH proxy"),QLineEdit::Password,QString::null, &ok);
+ bool useBrokerPassForProxy=false;
+ if(brokerMode)
+ {
+ useBrokerPassForProxy=(st->setting()->value (
+ sid+"/usebrokerpassforproxy", false
+ ).toBool() );
+ }
+ if(useBrokerPassForProxy)
+ proxypassword=config.brokerPass;
+ else
+ proxypassword=QInputDialog::getText(0,proxylogin+"@"+proxyserver+":"+QString::number(proxyport),
+ tr("Enter password for SSH proxy"),QLineEdit::Password,QString::null, &ok);
}
}
hooks/post-receive
--
x2goclient.git (X2Go Client)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).
More information about the x2go-commits
mailing list