Merge 1.1.0 changes back to master.
This commit is contained in:
commit
ce7bea66cf
@ -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");
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user