This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit dc8838fb9e504c63e2dec776c8b12e9cd53aeb04 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Wed Jun 27 14:05:18 2018 +0200 Add SSH instruction to list of errors if keyboard-interactive auth has failed. --- debian/changelog | 5 +++++ src/sshmasterconnection.cpp | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 30582aa..e21e46a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium + [ X2Go Release Manager ] * Continue development + [ Oleksandr Shneyder ] + * New upstream version (4.1.2.2): + - Add SSH instruction to list of errors if keyboard-interactive auth has failed. + -- X2Go Release Manager <git-admin@x2go.org> Tue, 26 Jun 2018 00:39:28 +0200 x2goclient (4.1.2.1-0x2go1) unstable; urgency=medium diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index e3c252f..049bee0 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -1040,6 +1040,7 @@ bool SshMasterConnection::userAuthKeyboardInteractive(QString prompt) int rez=SSH_AUTH_INFO; bool firstLoop=true; int prompts=1; + QString instruction; while (rez==SSH_AUTH_INFO) { @@ -1054,7 +1055,7 @@ bool SshMasterConnection::userAuthKeyboardInteractive(QString prompt) emit updateInteraction(this, ssh_userauth_kbdint_getprompt(my_ssh_session,0,NULL)); QString name= ssh_userauth_kbdint_getname(my_ssh_session); - QString instruction = ssh_userauth_kbdint_getinstruction(my_ssh_session); + instruction = ssh_userauth_kbdint_getinstruction(my_ssh_session); #ifdef DEBUG x2goDebug<<"Have prompts: "<<prompts<<endl; x2goDebug<<"Name: "<<name<<endl; @@ -1104,6 +1105,10 @@ bool SshMasterConnection::userAuthKeyboardInteractive(QString prompt) { x2goDebug<<"Keyboard authentication failed"; QString err=ssh_get_error ( my_ssh_session ); + if(instruction.length()>0) + { + authErrors<<instruction; + } authErrors<<err; emit finishInteraction(this); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git