This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch bugfix/x2goplugin-patch in repository x2goclient. discards 9b302fe src/{onmainwindow,sshmasterconnection}.cpp: enable use of SSH proxy configuration with x2goplugin. Fixes: #798. new 02dda79 {LICENSE,debian/copyright}: fix typo in URL of obviously-nice.de. new d5dedea src/{onmainwindow,sshmasterconnection}.cpp: enable use of SSH proxy configuration with x2goplugin. Fixes: #798. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9b302fe) \ N -- N -- N refs/heads/bugfix/x2goplugin-patch (d5dedea) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: LICENSE | 2 +- debian/changelog | 5 +++++ debian/copyright | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/x2goplugin-patch in repository x2goclient. commit 02dda7931f6a6e10f1535eae4ef15e45f53c0bd3 Author: René Genz <liebundartig@freenet.de> Date: Mon Mar 16 05:47:15 2015 +0100 {LICENSE,debian/copyright}: fix typo in URL of obviously-nice.de. --- LICENSE | 2 +- debian/changelog | 5 +++++ debian/copyright | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index bd97d9c..2bcfd6e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2005-2015 Obviously Nice -- http://www.obviouslynice.de +Copyright (C) 2005-2015 Obviously Nice -- http://www.obviously-nice.de Copyright (C) 2007-2015 X2Go Project -- http://wiki.x2go.org This program is free software; you can redistribute it and/or modify diff --git a/debian/changelog b/debian/changelog index 6301aa0..7ffc347 100644 --- a/debian/changelog +++ b/debian/changelog @@ -245,6 +245,11 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low - onmainwindow.cpp: fix bad quoting when writing remote xinerama config file. Fixes: #797. + [ René Genz ] + * New upstream release (4.0.4.0): + - {LICENSE,debian/copyright}: fix typo in URL of obviously-nice.de. + Fixes: #811. + -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium diff --git a/debian/copyright b/debian/copyright index 0b9c995..c80cee8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,7 +6,7 @@ Source: http://wiki.x2go.org Files: * Copyright: 2005-2015, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> 2005-2015, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> - 2005-2015, obviously nice - http://www.obviouslynice.de + 2005-2015, obviously nice - http://www.obviously-nice.de License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/x2goplugin-patch in repository x2goclient. commit d5dedea2833c65bc14e376e434c053a78577f53f Author: Nicolas Husson <nicolas.husson@tactualities.com> Date: Tue Mar 10 06:03:28 2015 +0100 src/{onmainwindow,sshmasterconnection}.cpp: enable use of SSH proxy configuration with x2goplugin. Fixes: #798. v2: refactor patch, fix whitespace issues. (Mihai Moldovan) --- debian/changelog | 6 ++ src/onmainwindow.cpp | 149 +++++++++++++++++++++++++++++-------------- src/sshmasterconnection.cpp | 5 +- 3 files changed, 112 insertions(+), 48 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7ffc347..c662bcc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -250,6 +250,12 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low - {LICENSE,debian/copyright}: fix typo in URL of obviously-nice.de. Fixes: #811. + [ Nicolas Husson ] + * New upstream release (4.0.4.0): + - src/{onmainwindow,sshmasterconnection}.cpp: enable use of SSH proxy + configuration with x2goplugin. Fixes: #798. + + v2: refactor patch, fix whitespace issues. (Mihai Moldovan) + -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 50db7b5..43a6378 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -3300,50 +3300,53 @@ bool ONMainWindow::startSession ( const QString& sid ) currentKey=findSshKeyForServer(user, host, sshPort); } - useproxy=(st->setting()->value ( - sid+"/usesshproxy", - false - ).toBool() ); + if (!embedMode) { + useproxy = (st->setting ()->value (sid + "/usesshproxy", + false).toBool ()); - QString prtype= st->setting()->value ( - sid+"/sshproxytype", - "SSH" - ).toString() ; + QString prtype = (st->setting ()->value (sid + "/sshproxytype", + "SSH").toString ()); + if (prtype.toLower () == "http") { + proxyType = SshMasterConnection::PROXYHTTP; + } + else { + proxyType = SshMasterConnection::PROXYSSH; + } - if(prtype=="HTTP") - { - proxyType=SshMasterConnection::PROXYHTTP; - } - else - { - proxyType=SshMasterConnection::PROXYSSH; - } + proxylogin = (st->setting ()->value (sid + "/sshproxyuser", + QString ()).toString ()); - proxylogin=(st->setting()->value ( - sid+"/sshproxyuser", - QString() - ).toString() ); + proxyKey = (st->setting ()->value (sid + "/sshproxykeyfile", + QString ()).toString ()); + proxyKey = expandHome (proxyKey); - proxyKey=(st->setting()->value ( - sid+"/sshproxykeyfile", - QString() - ).toString() ); - proxyKey=expandHome(proxyKey); + proxyserver = (st->setting ()->value (sid + "/sshproxyhost", + QString ()).toString ()); - proxyserver=(st->setting()->value ( - sid+"/sshproxyhost", - QString() - ).toString() ); + proxyport = (st->setting ()->value (sid + "/sshproxyport", + 22).toInt ()); - proxyport=(st->setting()->value ( - sid+"/sshproxyport", - 22 - ).toInt() ); - if(proxyserver.indexOf(":")!=-1) - { - QStringList parts=proxyserver.split(":"); - proxyserver=parts[0]; - proxyport=parts[1].toInt(); + proxyAutologin = (st->setting ()->value (sid + "/sshproxyautologin", + false).toBool ()); + + proxyKrbLogin = (st->setting ()->value (sid + "/sshproxykrblogin", + false).toBool ()); + } + else { + useproxy = config.useproxy; + proxyType = config.proxyType; + proxylogin = config.proxylogin; + proxyKey = config.proxyKey; + proxyserver = config.proxyserver; + proxyport = config.proxyport; + proxyAutologin = config.proxyAutologin; + proxyKrbLogin = config.proxyKrbLogin; + } + + if (proxyserver.indexOf (":") != -1) { + QStringList parts = proxyserver.split (":"); + proxyserver = parts[0]; + proxyport = parts[1].toInt (); } bool proxySamePass=(st->setting()->value ( @@ -3354,15 +3357,6 @@ bool ONMainWindow::startSession ( const QString& sid ) sid+"/sshproxysameuser", false ).toBool() ); - proxyAutologin=(st->setting()->value ( - sid+"/sshproxyautologin", - false - ).toBool() ); - - proxyKrbLogin=(st->setting()->value ( - sid+"/sshproxykrblogin", - false - ).toBool() ); if(proxyKey.length()<=0 && proxyType==SshMasterConnection::PROXYSSH) { @@ -10747,6 +10741,67 @@ void ONMainWindow::processCfgLine ( QString line ) config.connectionts=lst[1]; return; } + if (lst[0] == "usesshproxy") + { + config.useproxy = true; + if (lst[1].toLower () == "true") { + config.useproxy = true; + } + else { + config.useproxy = false; + } + return; + } + if (lst[0] == "sshproxytype") + { + if (lst[1].toLower () == "http") { + config.proxyType = SshMasterConnection::PROXYHTTP; + } + else { + config.proxyType = SshMasterConnection::PROXYSSH; + } + return; + } + if (lst[0] == "sshproxyuser") + { + config.proxylogin = lst[1]; + return; + } + if (lst[0] == "sshproxyhost") + { + config.proxyserver = lst[1]; + return; + } + if (lst[0] == "sshproxyport") + { + config.proxyport = lst[1].toInt (); + return; + } + if (lst[0] == "sshproxyautologin") + { + if (lst[1].toLower () == "true") { + config.proxyAutologin = true; + } + else { + config.proxyAutologin = false; + } + return; + } + if (lst[0] == "sshproxykrblogin") + { + if (lst[1].toLower () == "true") { + config.proxyKrbLogin = true; + } + else { + config.proxyKrbLogin = false; + } + return; + } + if (lst[0] == "sshproxykeyfile") + { + config.proxyKey = lst[1]; + return; + } } void ONMainWindow::slotChangeKbdLayout(const QString& layout) diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index e9a7008..1e11c62 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -165,6 +165,9 @@ SshMasterConnection::SshMasterConnection (QObject* parent, QString host, int por breakLoop=false; kerberosDelegation=false; + x2goDebug << "SshMasterConnection, host " << host << "port " << port << "user " << user + << "useproxy " << useproxy << "proxyserver " << proxyserver + << "proxyport " << proxyport; this->host=host; this->port=port; this->user=user; @@ -443,7 +446,7 @@ void SshMasterConnection::run() #endif if(useproxy && proxytype==PROXYSSH) { - + x2goDebug << "proxyserver: " << proxyserver << "proxyport: " << proxyport << "proxylogin: " << proxylogin; sshProxy=new SshMasterConnection (0, proxyserver, proxyport,acceptUnknownServers, proxylogin, proxypassword, proxykey, proxyautologin, proxyKrbLogin, false); connect ( sshProxy, SIGNAL ( connectionOk(QString) ), this, SLOT ( slotSshProxyConnectionOk() ) ); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org