nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Set trust status appropriately for rlogin.

Browse Source 
Previously, all output in an rlogin session had spurious trust sigils.
This commit is contained in:
Jacob Nevins 2019-03-17 13:40:56 +00:00
parent bda765dbd2
commit 63b63b6243
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rlogin.c
View File

@ -221,6 +221,8 @@ static const char *rlogin_init(Seat *seat, Backend **backend_handle,
* anything else until the local prompt mechanism returns. * anything else until the local prompt mechanism returns.
*/ */
if ((ruser = get_remote_username(conf)) != NULL) { if ((ruser = get_remote_username(conf)) != NULL) {
/* Next terminal output will come from server */
seat_set_trust_status(rlogin->seat, false);
rlogin_startup(rlogin, ruser); rlogin_startup(rlogin, ruser);
sfree(ruser); sfree(ruser);
} else { } else {
@ -233,6 +235,8 @@ static const char *rlogin_init(Seat *seat, Backend **backend_handle,
add_prompt(rlogin->prompt, dupstr("rlogin username: "), true); add_prompt(rlogin->prompt, dupstr("rlogin username: "), true);
ret = seat_get_userpass_input(rlogin->seat, rlogin->prompt, NULL); ret = seat_get_userpass_input(rlogin->seat, rlogin->prompt, NULL);
if (ret >= 0) { if (ret >= 0) {
/* Next terminal output will come from server */
seat_set_trust_status(rlogin->seat, false);
rlogin_startup(rlogin, rlogin->prompt->prompts[0]->result); rlogin_startup(rlogin, rlogin->prompt->prompts[0]->result);
} }
} }
@ -280,6 +284,8 @@ static size_t rlogin_send(Backend *be, const char *buf, size_t len)
*/ */
int ret = seat_get_userpass_input(rlogin->seat, rlogin->prompt, &bc); int ret = seat_get_userpass_input(rlogin->seat, rlogin->prompt, &bc);
if (ret >= 0) { if (ret >= 0) {
/* Next terminal output will come from server */
seat_set_trust_status(rlogin->seat, false);
rlogin_startup(rlogin, rlogin->prompt->prompts[0]->result); rlogin_startup(rlogin, rlogin->prompt->prompts[0]->result);
/* that nulls out rlogin->prompt, so then we'll start sending /* that nulls out rlogin->prompt, so then we'll start sending
* data down the wire in the obvious way */ * data down the wire in the obvious way */