[X2Go-Commits] [x2goclient] 02/02: Fix password connection with libssh 0.6.0. (Fixes: #420).

[git-admin at x2go.org]

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 c9e895b59c038c9c2a8c68ab66c53f2abb868092
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Mar 29 21:11:45 2014 +0100

    Fix password connection with libssh 0.6.0. (Fixes: #420).
---
 debian/changelog        |    2 +-
 sshmasterconnection.cpp |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 36e61a3..e757677 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,7 @@ x2goclient (4.0.1.4-0x2go1) UNRELEASED; urgency=low
 
   [ Orion Poplawski ]
   * New upstream version (4.0.1.4):
-    - Fix password connection with libssh 0.6.0
+    - Fix password connection with libssh 0.6.0. (Fixes: 420).
     - Don't use ancient Debianism's for ssh options (ProtocolKeepAlives).
       (Fixes: #434).
 
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