From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 9 Sep 2019 09:24:00 +0000 (+0300)
Subject: auth: If user is already authenticated, passdb result shouldn't be password_mismatch
X-Git-Tag: 2.3.9~161
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35badb9923f07468e57753ae3f3ea128faee830c;p=thirdparty%2Fdovecot%2Fcore.git

auth: If user is already authenticated, passdb result shouldn't be password_mismatch

This caused confusion in the auth_request_passdb_finished event's result
parameter. Otherwise it shouldn't have caused any bugs.
---

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index 37939fc87f..c5713be1d0 100644
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -2833,6 +2833,10 @@ int auth_request_password_verify_log(struct auth_request *request,
 
 enum passdb_result auth_request_password_missing(struct auth_request *request)
 {
+	if (request->skip_password_check) {
+		/* This passdb wasn't used for authentication */
+		return PASSDB_RESULT_OK;
+	}
 	e_info(authdb_event(request),
 	       "No password returned (and no nopassword)");
 	return PASSDB_RESULT_PASSWORD_MISMATCH;