Mercurial > dropbear
diff cli-authpasswd.c @ 297:79bf1023cf11 agent-client
propagate from branch 'au.asn.ucc.matt.dropbear' (head 0501e6f661b5415eb76f3b312d183c3adfbfb712)
to branch 'au.asn.ucc.matt.dropbear.cli-agent' (head 01038174ec27245b51bd43a66c01ad930880f67b)
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Tue, 21 Mar 2006 16:20:59 +0000 |
| parents | 475a818dd6e7 |
| children | 8f3ec7c104d9 |
line wrap: on
line diff
--- a/cli-authpasswd.c Mon Jul 18 14:32:52 2005 +0000 +++ b/cli-authpasswd.c Tue Mar 21 16:20:59 2006 +0000 @@ -113,7 +113,7 @@ } #endif /* ENABLE_CLI_ASKPASS_HELPER */ -int cli_auth_password() { +void cli_auth_password() { char* password = NULL; @@ -125,10 +125,7 @@ password = gui_getpass("Password: "); else #endif - password = getpass("Password: "); - - if (password == NULL) - return 0; + password = getpass_or_cancel("Password: "); buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_REQUEST); @@ -149,7 +146,5 @@ m_burn(password, strlen(password)); TRACE(("leave cli_auth_password")) - return 1; /* Password auth can always be tried */ - } #endif /* ENABLE_CLI_PASSWORD_AUTH */