This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient.
commit b54ff5b1370e0e6be98c24146c0e2babeb30b6d5 Author: Mihai Moldovan <[email protected]> Date: Thu May 23 02:43:14 2019 +0200 src/sshmasterconnection.cpp: fix compiler warning due to mismatching argument with older libssh versions. --- debian/changelog | 2 ++ src/sshmasterconnection.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 08e7e1f..c8ad23c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,6 +71,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium - Windows: upgrade bundled VcXsrv to 1.20.1.4. - src/sshmasterconnection.cpp: use info (protocol) log level with --libssh-debug and debug (packet) log level with --libssh-packetlog. + - src/sshmasterconnection.cpp: fix compiler warning due to mismatching + argument with older libssh versions. * debian/control: + Add build-depend on pkg-config. * x2goclient.spec: diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index 8909a06..eb163f0 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -1403,7 +1403,7 @@ bool SshMasterConnection::userAuthWithKey() priv_key = NULL; } #else - priv_key = privatekey_from_file (my_ssh_session, tmp_ba.data (), NULL, tmp_ba_passphrase.data ()); + priv_key = privatekey_from_file (my_ssh_session, tmp_ba.data (), 0, tmp_ba_passphrase.data ()); #endif if(i++==2) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git _______________________________________________ x2go-commits mailing list [email protected] https://lists.x2go.org/listinfo/x2go-commits
