Mercurial > dropbear
changeset 334:8f3ec7c104d9
Make the dbclient password prompt more useful
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Mon, 12 Jun 2006 14:41:32 +0000 |
| parents | 9341570412e5 |
| children | e17f0333c21e |
| files | auth.h cli-auth.c cli-authpasswd.c |
| diffstat | 3 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/auth.h Mon Jun 12 03:51:40 2006 +0000 +++ b/auth.h Mon Jun 12 14:41:32 2006 +0000 @@ -52,7 +52,7 @@ void cli_auth_password(); int cli_auth_pubkey(); void cli_auth_interactive(); -char* getpass_or_cancel(); +char* getpass_or_cancel(char* prompt); #define MAX_USERNAME_LEN 25 /* arbitrary for the moment */
--- a/cli-auth.c Mon Jun 12 03:51:40 2006 +0000 +++ b/cli-auth.c Mon Jun 12 14:41:32 2006 +0000 @@ -281,11 +281,11 @@ /* A helper for getpass() that exits if the user cancels. The returned * password is statically allocated by getpass() */ -char* getpass_or_cancel() +char* getpass_or_cancel(char* prompt) { char* password = NULL; - password = getpass("Password: "); + password = getpass(prompt); /* 0x03 is a ctrl-c character in the buffer. */ if (password == NULL || strchr(password, '\3') != NULL) {
--- a/cli-authpasswd.c Mon Jun 12 03:51:40 2006 +0000 +++ b/cli-authpasswd.c Mon Jun 12 14:41:32 2006 +0000 @@ -116,16 +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_or_cancel("Password: "); + password = getpass_or_cancel(prompt); buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_REQUEST);