This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from c57e418 Windows: Update Win32 OpenSSL from 1.0.2k to 1.0.2n new 607c333 destroy unused SSH sessions for LDAP authentication. The 1 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: debian/changelog | 1 + src/onmainwindow.cpp | 15 +++++++++++++++ src/onmainwindow.h | 1 + 3 files changed, 17 insertions(+) -- Alioth's /home/x2go-admin/maintenancescripts/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 master in repository x2goclient. commit 607c333a6b412f6906fec822060b143ee91283ff Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Tue Mar 6 15:34:14 2018 +0100 destroy unused SSH sessions for LDAP authentication. --- debian/changelog | 1 + src/onmainwindow.cpp | 15 +++++++++++++++ src/onmainwindow.h | 1 + 3 files changed, 17 insertions(+) diff --git a/debian/changelog b/debian/changelog index 213f941..9ce7036 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium * New upstream version (4.1.2.0): - don't start gpg agent for PGP card authentication. Use system agent instead. - change search string for pcsc_scan. + - destroy unused SSH sessions for LDAP authentication. [ Mihai Moldovan ] * New upstream version (4.1.2.0): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 892b904..eca9451 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -1547,6 +1547,7 @@ void ONMainWindow::closeClient() x2goDebug<<"SSH connection finished."; } } + serverSshConnections.clear(); } if ( soundServer ) @@ -3086,6 +3087,18 @@ void ONMainWindow::slotSshConnectionOk() continueNormalSession(); } +void ONMainWindow::cleanServerSshConnections() +{ + for(int i=serverSshConnections.size()-1;i>=0;--i) + { + if(serverSshConnections[i]!=sshConnection) + { + delete serverSshConnections[i]; + } + } + serverSshConnections.clear(); +} + SshMasterConnection* ONMainWindow::findServerSshConnection(QString host) { @@ -4201,6 +4214,7 @@ void ONMainWindow::startNewSession() QMessageBox::NoButton ); return; } + cleanServerSshConnections(); } else { @@ -4580,6 +4594,7 @@ void ONMainWindow::resumeSession ( const x2goSession& s ) QMessageBox::NoButton ); return; } + cleanServerSshConnections(); } else { diff --git a/src/onmainwindow.h b/src/onmainwindow.h index 3e051a3..da238d5 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -559,6 +559,7 @@ public: SshMasterConnection* findServerSshConnection(QString host); + void cleanServerSshConnections(); void showHelp(); void showVersion(); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org