This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 7a58037568dc37a7012d772324416a8ade4a7a3f Author: Melroy van den Berg <melroy@melroy.org> Date: Wed May 20 09:24:03 2020 +0200 src/sshmasterconnection: fix 'when not' password auth. Avoids double error messages. --- debian/changelog | 2 ++ src/sshmasterconnection.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e4342a7..fe0109d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium execution failed. - src/sshmasterconnection: refactor some of the channel loop and fix channel/session closes. + - src/sshmasterconnection: fix 'when not' password auth. Avoids double + error messages. -- X2Go Release Manager <git-admin@x2go.org> Thu, 13 Feb 2020 12:31:20 +0100 diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index 68d6047..932c7d5 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -1260,7 +1260,7 @@ bool SshMasterConnection::userAuthWithPass() } } - if ((!ret) && (method & ~SSH_AUTH_METHOD_PASSWORD)) { + if ((!ret) && (!(method & SSH_AUTH_METHOD_PASSWORD))) { /* In case password auth is disabled, make sure the error message is not empty. */ QString err = ssh_get_error (my_ssh_session); authErrors << err; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git