This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 1ed20bfd0afaf2733e83136ba0e39d4c7c7abde0 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed May 20 09:47:39 2020 +0200 src/sshmasterconnection.{c,h}: fix builds, new function should have been registered and not static, but private. --- debian/changelog | 5 +++++ src/sshmasterconnection.cpp | 5 +---- src/sshmasterconnection.h | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 21abcc1..2251bf9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index 3f9dc25..667e0ef 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -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 ); diff --git a/src/sshmasterconnection.h b/src/sshmasterconnection.h index ffb853b..18a6d20 100644 --- a/src/sshmasterconnection.h +++ b/src/sshmasterconnection.h @@ -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); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git