This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit fcf573ff3523dfbb1da89a3e699a1aab097103d7 Author: Orion Poplawski <orion@cora.nwra.com> Date: Thu Jan 14 04:02:20 2016 +0100 sshmasterconnection.cpp: check correct variable for validity: public key instead of private key (again.) Fixes: #945. --- debian/changelog | 2 ++ src/sshmasterconnection.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2f8f895..d0a9f30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -66,6 +66,8 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low for ~/.bash_logout and friend scripts to be executed, which may contain calls to ncurses' reset or clear, also set the TERM variable to dump to not have unexpected output on stderr at logout time. + - sshmasterconnection.cpp: check correct variable for validity: public key + instead of private key (again.) Fixes: #945. -- X2Go Release Manager <git-admin@x2go.org> Tue, 28 Jul 2015 06:05:27 +0200 diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index 9aecdbf..0af36f2 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -1091,7 +1091,7 @@ bool SshMasterConnection::userAuthWithKey() return false; } ssh_public_key pubkey=publickey_from_privatekey(prkey); - if (!prkey) + if (!pubkey) { #ifdef DEBUG x2goDebug<<"Failed to get public key from private key."<<endl; -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git