This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 71979ab - Set modmap timer timeout to 10 sec on Mac. - Fix running xmodmap if X2Go Client not started from terminal. - Setting keyboard modifiers with xmodmap. new 083ece2 Fix password connection with libssh 0.6.0 new a6ae6f6 changelog fix for last commit new 5cc3729 changelog fix: password conenction libssh 0.6.0 fix occurs with 4.0.1.4 (not with released 4.0.1.3) The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 8 ++++++-- sshmasterconnection.cpp | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 5cc3729121afbc21e283f47fb1ee193859c2128a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Feb 4 12:44:14 2014 +0100 changelog fix: password conenction libssh 0.6.0 fix occurs with 4.0.1.4 (not with released 4.0.1.3) --- debian/changelog | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 132455a..f558b4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,7 +43,6 @@ 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): -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit a6ae6f6b9795f2cb8e6ecc2c541b4d8adfc21dd3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Feb 4 12:41:15 2014 +0100 changelog fix for last commit Conflicts (resolved by Mike Gabriel): debian/changelog --- debian/changelog | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6d8ce2a..132455a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,7 +20,11 @@ x2goclient (4.0.1.4-0x2go1) UNRELEASED; urgency=low - Fix mod map on Mac with kerberos. - Fix focus on pass form. - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 Jan 2014 09:20:08 +0100 + [ Orion Poplawski ] + * New upstream version (4.0.1.4): + - Fix password connection with libssh 0.6.0 + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 Jan 2014 09:17:39 +0100 x2goclient (4.0.1.3-0x2go1) unstable; urgency=low -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 083ece20445bf6e1db26a74856185d0c9b1e8b5a 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 b597a28..6d8ce2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,7 +18,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:20:08 +0100 @@ -39,6 +39,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 e0266db..827eefe 100755 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -936,6 +936,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