diff options
author | Matt Johnston <matt@ucc.asn.au> | 2013-04-02 00:11:53 +0800 |
---|---|---|
committer | Matt Johnston <matt@ucc.asn.au> | 2013-04-02 00:11:53 +0800 |
commit | baf0a86ab5fe75a25e80fedd3ece1e18ccea5371 (patch) | |
tree | 0f38ee82ada8568db8ebfa1d8c7e49ddbefc3559 /cli-session.c | |
parent | 655d681bebbb289537d69212805b62df471ea32d (diff) | |
download | dropbear-baf0a86ab5fe75a25e80fedd3ece1e18ccea5371.tar.gz |
Be a bit more careful about when we want to use CLI_AUTH_IMMEDIATE
Only use it if we have pubkeys to try, or we have $DROPBEAR_PASSWORD set
Diffstat (limited to 'cli-session.c')
-rw-r--r-- | cli-session.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cli-session.c b/cli-session.c index 0c6635a..b13948f 100644 --- a/cli-session.c +++ b/cli-session.c @@ -221,7 +221,9 @@ static void cli_sessionloop() { return; case USERAUTH_FAIL_RCVD: - cli_auth_try(); + if (cli_auth_try() == DROPBEAR_FAILURE) { + dropbear_exit("No auth methods could be used."); + } cli_ses.state = USERAUTH_REQ_SENT; TRACE(("leave cli_sessionloop: cli_auth_try")) return; |