[X2Go-Commits] [x2goclient] 01/03: Revert "Fix password connection with libssh 0.6.0"

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 7afdf2df03cb915313d06e7f4e7e1fffbd2a53e9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Mar 29 21:07:39 2014 +0100

    Revert "Fix password connection with libssh 0.6.0"
    
    This reverts commit 083ece20445bf6e1db26a74856185d0c9b1e8b5a.
---
 debian/changelog        |    2 +-
 sshmasterconnection.cpp |    3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f5db338..2570ec2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -69,7 +69,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.
 
   [ Orion Poplawski ]
   * New upstream version (4.0.1.4):
diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
index 827eefe..e0266db 100755
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -936,9 +936,6 @@ 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