Mercurial > dovecot > core-2.2
changeset 20620:66a4f25b9e0e
auth: Removed redundant noauthenticate checks.
Now that noauthenticate also adds nopassword field.
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Wed, 10 Aug 2016 17:15:21 +0300 |
| parents | 533591bab969 |
| children | bac0781b6e1f |
| files | src/auth/auth-request.c src/auth/passdb-sql.c |
| diffstat | 2 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auth/auth-request.c Wed Aug 10 17:14:28 2016 +0300 +++ b/src/auth/auth-request.c Wed Aug 10 17:15:21 2016 +0300 @@ -2280,8 +2280,7 @@ return 0; } - if (auth_fields_exists(request->extra_fields, "nopassword") || - auth_fields_exists(request->extra_fields, "noauthenticate")) { + if (auth_fields_exists(request->extra_fields, "nopassword")) { auth_request_log_debug(request, subsystem, "Allowing any password"); return 1;
--- a/src/auth/passdb-sql.c Wed Aug 10 17:14:28 2016 +0300 +++ b/src/auth/passdb-sql.c Wed Aug 10 17:15:21 2016 +0300 @@ -99,8 +99,7 @@ auth_request_log_error(auth_request, AUTH_SUBSYS_DB, "Password query returned multiple matches"); } else if (auth_request->passdb_password == NULL && - !auth_fields_exists(auth_request->extra_fields, "nopassword") && - !auth_fields_exists(auth_request->extra_fields, "noauthenticate")) { + !auth_fields_exists(auth_request->extra_fields, "nopassword")) { auth_request_log_info(auth_request, AUTH_SUBSYS_DB, "Empty password returned without nopassword"); passdb_result = PASSDB_RESULT_PASSWORD_MISMATCH;