GUACAMOLE-547: Relocate NULL check and log when NONE succeeds.

This commit is contained in:
Nick Couchman 2018-11-11 16:11:06 -05:00
parent b7dca0ed16
commit 4641da06ac

View File

@ -318,12 +318,17 @@ static int guac_common_ssh_authenticate(guac_common_ssh_session* common_session)
/* Get list of supported authentication methods */ /* Get list of supported authentication methods */
char* user_authlist = libssh2_userauth_list(session, username, char* user_authlist = libssh2_userauth_list(session, username,
strlen(username)); strlen(username));
/* If auth list is NULL, then authentication has succeeded with NONE */
if (user_authlist == NULL) {
guac_client_log(client, GUAC_LOG_DEBUG,
"SSH NONE authentication succeeded.");
return 0;
}
guac_client_log(client, GUAC_LOG_DEBUG, guac_client_log(client, GUAC_LOG_DEBUG,
"Supported authentication methods: %s", user_authlist); "Supported authentication methods: %s", user_authlist);
/* If auth list is NULL, then authentication has succeeded with NONE */
if (user_authlist == NULL)
return 0;
/* Authenticate with private key, if provided */ /* Authenticate with private key, if provided */
if (key != NULL) { if (key != NULL) {