This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goclient. commit add49515d3a777596156f9edcf9655d79194067a Author: Orion Poplawski <orion@cora.nwra.com> Date: Tue Feb 4 12:28:07 2014 +0100 Fix password connection with libssh 0.6.0 --- debian/changelog | 3 ++- sshmasterconnection.cpp | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b3e4049..296a9a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ x2goclient (4.0.1.4-0x2go1) UNRELEASED; urgency=low - Increase ssh_select timeout to 0.5 sec. - Set mod map from client to server on Mac, hide keyboard settings on Mac. - Fix mod map on Mac with kerberos. - - Fix focus on pass form. + - Fix focus on pass form. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 Jan 2014 09:17:39 +0100 @@ -22,6 +22,7 @@ x2goclient (4.0.1.3-0x2go1) unstable; urgency=low [ Orion Poplawski ] * New upstream version (4.0.1.3): - Protect x2goplugin.html. Make it only available from the local host. + - Fix password connection with libssh 0.6.0 [ Mike Gabriel ] * New upstream version (4.0.1.3): diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 34eea42..de73f0d 100755 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -924,6 +924,9 @@ bool SshMasterConnection::userChallengeAuth() bool SshMasterConnection::userAuthWithPass() { + // Populate the userauth_list + ssh_userauth_none(my_ssh_session, NULL); + int method = ssh_userauth_list(my_ssh_session, NULL); if (method& SSH_AUTH_METHOD_INTERACTIVE) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git