rename some options and move some to sysoptions.h

This commit is contained in:
Matt Johnston
2018-02-18 00:29:17 +08:00
parent c8d852caf6
commit c2f2f2b817
4 changed files with 106 additions and 149 deletions

View File

@@ -60,7 +60,7 @@ void cli_auth_getmethods() {
*/
if (ses.keys->trans.algo_comp != DROPBEAR_COMP_ZLIB_DELAY) {
ses.authstate.authtypes = AUTH_TYPE_PUBKEY;
#if DROPBEAR_USE_DROPBEAR_PASSWORD
#if DROPBEAR_USE_PASSWORD_ENV
if (getenv(DROPBEAR_PASSWORD_ENV)) {
ses.authstate.authtypes |= AUTH_TYPE_PASSWORD | AUTH_TYPE_INTERACT;
}
@@ -337,7 +337,7 @@ char* getpass_or_cancel(const char* prompt)
{
char* password = NULL;
#if DROPBEAR_USE_DROPBEAR_PASSWORD
#if DROPBEAR_USE_PASSWORD_ENV
/* Password provided in an environment var */
password = getenv(DROPBEAR_PASSWORD_ENV);
if (password)