Mercurial > dropbear
diff cli-auth.c @ 478:d4f32c3443ac dbclient-netcat-alike
propagate from branch 'au.asn.ucc.matt.dropbear' (head f21045c791002d81fc6b8dde6537ea481e513eb2)
to branch 'au.asn.ucc.matt.dropbear.dbclient-netcat-alike' (head d1f69334581dc4c35f9ca16aa5355074c9dd315d)
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Sun, 14 Sep 2008 06:47:51 +0000 |
| parents | fdf06a5a54e4 |
| children | d58c478bd399 |
line wrap: on
line diff
--- a/cli-auth.c Tue Mar 21 16:16:41 2006 +0000 +++ b/cli-auth.c Sun Sep 14 06:47:51 2008 +0000 @@ -236,8 +236,8 @@ void cli_auth_try() { + int finished = 0; TRACE(("enter cli_auth_try")) - int finished = 0; CHECKCLEARTOWRITE(); @@ -281,11 +281,20 @@ /* 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; + +#ifdef DROPBEAR_PASSWORD_ENV + /* Password provided in an environment var */ + password = getenv(DROPBEAR_PASSWORD_ENV); + if (password) + { + return password; + } +#endif - password = getpass("Password: "); + password = getpass(prompt); /* 0x03 is a ctrl-c character in the buffer. */ if (password == NULL || strchr(password, '\3') != NULL) {