From 9228d2637a4a43e411d0f153d67fe05e8602aba9 Mon Sep 17 00:00:00 2001 From: fgiuba Date: Fri, 5 Jul 2019 17:51:36 +0200 Subject: [PATCH 1/2] GUACAMOLE-547: Do not ignore password from settings. --- src/protocols/ssh/ssh.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/protocols/ssh/ssh.c b/src/protocols/ssh/ssh.c index 0a67be08..82d0507d 100644 --- a/src/protocols/ssh/ssh.c +++ b/src/protocols/ssh/ssh.c @@ -130,6 +130,11 @@ static guac_common_ssh_user* guac_ssh_get_user(guac_client* client) { } /* end if key given */ + /* If available, get password from settings */ + else if (settings->password != NULL){ + guac_common_ssh_user_set_password(user, settings->password); + } + /* Clear screen of any prompts */ guac_terminal_printf(ssh_client->term, "\x1B[H\x1B[J"); From 55add063c50b308c395fc6d6471333758383f7ef Mon Sep 17 00:00:00 2001 From: fgiuba Date: Thu, 11 Jul 2019 09:37:17 +0200 Subject: [PATCH 2/2] GUACAMOLE-547: Add missing space between brackets. --- src/protocols/ssh/ssh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/protocols/ssh/ssh.c b/src/protocols/ssh/ssh.c index 82d0507d..8a18cf4d 100644 --- a/src/protocols/ssh/ssh.c +++ b/src/protocols/ssh/ssh.c @@ -131,7 +131,7 @@ static guac_common_ssh_user* guac_ssh_get_user(guac_client* client) { } /* end if key given */ /* If available, get password from settings */ - else if (settings->password != NULL){ + else if (settings->password != NULL) { guac_common_ssh_user_set_password(user, settings->password); }