Mercurial > dropbear
diff svr-auth.c @ 1617:1fbe598a14fb
Merge bugfix delay invalid users
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Thu, 23 Aug 2018 23:43:45 +0800 |
| parents | 768ebf737aa0 5d2d1021ca00 |
| children | e11ed628708b |
line wrap: on
line diff
--- a/svr-auth.c Tue Jul 24 20:19:05 2018 +0800 +++ b/svr-auth.c Thu Aug 23 23:43:45 2018 +0800 @@ -149,10 +149,8 @@ if (methodlen == AUTH_METHOD_PASSWORD_LEN && strncmp(methodname, AUTH_METHOD_PASSWORD, AUTH_METHOD_PASSWORD_LEN) == 0) { - if (valid_user) { - svr_auth_password(); - goto out; - } + svr_auth_password(valid_user); + goto out; } } #endif @@ -164,10 +162,8 @@ if (methodlen == AUTH_METHOD_PASSWORD_LEN && strncmp(methodname, AUTH_METHOD_PASSWORD, AUTH_METHOD_PASSWORD_LEN) == 0) { - if (valid_user) { - svr_auth_pam(); - goto out; - } + svr_auth_pam(valid_user); + goto out; } } #endif @@ -177,12 +173,7 @@ if (methodlen == AUTH_METHOD_PUBKEY_LEN && strncmp(methodname, AUTH_METHOD_PUBKEY, AUTH_METHOD_PUBKEY_LEN) == 0) { - if (valid_user) { - svr_auth_pubkey(); - } else { - /* pubkey has no failure delay */ - send_msg_userauth_failure(0, 0); - } + svr_auth_pubkey(valid_user); goto out; } #endif