X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/4a693cfc5c3ee0e639bbee0215345e921715ab04..208a0f09f8b18915b46d6ad39fc7c2c8f62fb930:/rlogin.c diff --git a/rlogin.c b/rlogin.c index 7cfe7837..fecc9d4b 100644 --- a/rlogin.c +++ b/rlogin.c @@ -62,6 +62,13 @@ static int rlogin_closing(Plug plug, const char *error_msg, int error_code, int calling_back) { Rlogin rlogin = (Rlogin) plug; + + /* + * We don't implement independent EOF in each direction for Telnet + * connections; as soon as we get word that the remote side has + * sent us EOF, we wind up the whole connection. + */ + if (rlogin->s) { sk_close(rlogin->s); rlogin->s = NULL; @@ -230,7 +237,7 @@ static const char *rlogin_init(void *frontend_handle, void **backend_handle, * in which case we prompt for it and may end up deferring doing * anything else until the local prompt mechanism returns. */ - if ((ruser = get_remote_username(conf)) == NULL) { + if ((ruser = get_remote_username(conf)) != NULL) { rlogin_startup(rlogin, ruser); sfree(ruser); } else { @@ -239,8 +246,7 @@ static const char *rlogin_init(void *frontend_handle, void **backend_handle, rlogin->prompt = new_prompts(rlogin->frontend); rlogin->prompt->to_server = TRUE; rlogin->prompt->name = dupstr("Rlogin login name"); - /* 512 is an arbitrary limit :-( */ - add_prompt(rlogin->prompt, dupstr("rlogin username: "), TRUE, 512); + add_prompt(rlogin->prompt, dupstr("rlogin username: "), TRUE); ret = get_userpass_input(rlogin->prompt, NULL, 0); if (ret >= 0) { rlogin_startup(rlogin, rlogin->prompt->prompts[0]->result);