From: Martti Rannanjärvi <martti.rannanjarvi@open-xchange.com>
Date: Fri, 3 Jun 2022 08:15:05 +0000 (+0300)
Subject: auth: userdb - Stop calling USERDB_RESULT_OK after template expansion failure
X-Git-Tag: 2.4.0~3719
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=02e1d09e416584dec94266c59df334fdf5b64fde;p=thirdparty%2Fdovecot%2Fcore.git

auth: userdb - Stop calling USERDB_RESULT_OK after template expansion failure

Call only USERDB_RESULT_INTERNAL_FAILURE. This was broken by
0f5dc4da3982053036be65190e44bf28a67b1ca2.
---

diff --git a/src/auth/userdb-passwd.c b/src/auth/userdb-passwd.c
index 3c9910279d..a16cb3b38a 100644
--- a/src/auth/userdb-passwd.c
+++ b/src/auth/userdb-passwd.c
@@ -118,6 +118,7 @@ static void passwd_lookup(struct auth_request *auth_request,
 		e_error(authdb_event(auth_request),
 			"Failed to expand template: %s", error);
 		callback(USERDB_RESULT_INTERNAL_FAILURE, auth_request);
+		return;
 	}
 
 	callback(USERDB_RESULT_OK, auth_request);
diff --git a/src/auth/userdb-static.c b/src/auth/userdb-static.c
index bed0f58616..4263262794 100644
--- a/src/auth/userdb-static.c
+++ b/src/auth/userdb-static.c
@@ -33,6 +33,7 @@ static void static_lookup_real(struct auth_request *auth_request,
 		e_error(authdb_event(auth_request),
 			"Failed to expand template: %s", error);
 		callback(USERDB_RESULT_INTERNAL_FAILURE, auth_request);
+		return;
 	}
 	callback(USERDB_RESULT_OK, auth_request);
 }