Mercurial > dropbear
diff cli-authpasswd.c @ 399:a707e6148060
merge of '5fdf69ca60d1683cdd9f4c2595134bed26394834'
and '6b61c50f4cf888bea302ac8fcf5dbb573b443251'
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Sat, 03 Feb 2007 08:20:34 +0000 |
| parents | 8f3ec7c104d9 |
| children | bde853a9e680 |
line wrap: on
line diff
--- a/cli-authpasswd.c Sat Feb 03 08:08:47 2007 +0000 +++ b/cli-authpasswd.c Sat Feb 03 08:20:34 2007 +0000 @@ -116,19 +116,19 @@ void cli_auth_password() { char* password = NULL; + char prompt[80]; TRACE(("enter cli_auth_password")) CHECKCLEARTOWRITE(); + snprintf(prompt, sizeof(prompt), "%s@%s's password: ", + cli_opts.username, cli_opts.remotehost); #ifdef ENABLE_CLI_ASKPASS_HELPER if (want_askpass()) - password = gui_getpass("Password: "); + password = gui_getpass(prompt); else #endif - password = getpass("Password: "); - - if (password == NULL) - return 0; + password = getpass_or_cancel(prompt); buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_REQUEST);