Commit 1ed20bfd authored by Mihai Moldovan's avatar Mihai Moldovan
Browse files

src/sshmasterconnection.{c,h}: fix builds, new function should have been...

src/sshmasterconnection.{c,h}: fix builds, new function should have been registered and not static, but private.
parent 56d82b91
......@@ -28,6 +28,11 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium
- src/sshmasterconnection: explicitly mark function parameters as unused.
- .gitignore: ignore Visual Studio temporary files. Fixes: #1469.
[ Mihai Moldovan ]
* New upstream version (4.1.2.3):
- src/sshmasterconnection.{c,h}: fix builds, new function should have been
registered and not static, but private.
-- X2Go Release Manager <git-admin@x2go.org> Thu, 13 Feb 2020 12:31:20 +0100
x2goclient (4.1.2.2-0x2go1) unstable; urgency=medium
......
......@@ -58,9 +58,6 @@ const QString SshMasterConnection::challenge_auth_code_prompts_[] = {
};
static bool SshMasterConnection::createChannelConnection (int i, int &maxsock, fd_set &rfds, ssh_channel *read_chan);
#ifdef Q_OS_WIN
#include <QSettings>
// parse known_hosts file from libssh and export keys in registry to use with plink.exe
......@@ -2106,7 +2103,7 @@ void SshMasterConnection::channelLoop()
/**
* Create SSH channel connection (used within a loop of channels)
*/
static bool SshMasterConnection::createChannelConnection (int i, int &maxsock, fd_set &rfds, ssh_channel *read_chan) {
bool SshMasterConnection::createChannelConnection (int i, int &maxsock, fd_set &rfds, ssh_channel *read_chan) {
int tcpSocket=channelConnections.at ( i ).sock;
if ( tcpSocket>0 )
FD_SET ( tcpSocket, &rfds );
......
......@@ -134,6 +134,7 @@ private:
bool userAuthKrb();
bool userAuthKeyboardInteractive(QString prompt);
void channelLoop();
bool createChannelConnection (int i, int &maxsock, fd_set &rfds, ssh_channel *read_chan);
void finalize(int arg1);
void copy();
int serverAuth(QString& errorMsg);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment