This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from a3a605a Continue development new 7cbd8d5 Do not attempt to perform Interaction with SSH Server The 1 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 | 6 +++++- src/sshmasterconnection.cpp | 38 ++++++++++++++++++++++---------------- 2 files changed, 27 insertions(+), 17 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/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 7cbd8d525309edb8bd05d27ec57ac72e2d8c90e8 Author: Mike DePaulo <mikedep333@gmail.com> Date: Sun Feb 18 19:52:22 2018 -0500 Do not attempt to perform Interaction with SSH Server (e.g. for changing expired password) when using GSSAPI/Kerberos because the interaction code does not support it yet. --- debian/changelog | 6 +++++- src/sshmasterconnection.cpp | 38 ++++++++++++++++++++++---------------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index ded8339..4c4a4b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ x2goclient (4.1.1.2-0x2go1) UNRELEASED; urgency=medium - * Continue development + [ Mike DePaulo ] + * New upstream version (4.1.1.2): + - src/sshmasterconnection.cpp: Do not attempt to perform Interaction with + SSH Server (e.g. for changing expired password) when using + GSSAPI/Kerberos because the interaction code does not support it yet. -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 22:01:32 +0100 diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index be327c6..0772f3f 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -725,23 +725,29 @@ void SshMasterConnection::run() #ifdef DEBUG x2goDebug<<"User authentication OK."; #endif - if(checkLogin()) - { - x2goDebug<<"Login Check - OK"; + // checkLogin() is currently specific to libssh. + if(kerberos) emit connectionOk(host); - } - else - { - x2goDebug<<"Login Check - Failed"; -// if(!interactionInterrupt) - { - emit finishInteraction(this); - } - ssh_disconnect ( my_ssh_session ); - ssh_free ( my_ssh_session ); - quit(); - return; - } + else + { + if(checkLogin()) + { + x2goDebug<<"Login Check - OK"; + emit connectionOk(host); + } + else + { + x2goDebug<<"Login Check - Failed"; +// if(!interactionInterrupt) + { + emit finishInteraction(this); + } + ssh_disconnect ( my_ssh_session ); + ssh_free ( my_ssh_session ); + quit(); + return; + } + } } else { -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org