Commit 7a580375 authored by Melroy van den Berg's avatar Melroy van den Berg Committed by Mihai Moldovan
Browse files

src/sshmasterconnection: fix 'when not' password auth.

Avoids double error messages.
parent 221899d1
......@@ -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
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment