From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 3 Aug 2020 14:11:14 +0000 (+0300)
Subject: auth: Move auth_request_master_lookup_finish() to auth-request-fields.c
X-Git-Tag: 2.3.13~325
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51623b9e9e5d8a7a44a852d737fe2de73f6ed13c;p=thirdparty%2Fdovecot%2Fcore.git

auth: Move auth_request_master_lookup_finish() to auth-request-fields.c

Also rename it to auth_request_master_user_login_finish().
---

diff --git a/src/auth/auth-request-fields.c b/src/auth/auth-request-fields.c
index f2909b02e5..26c62077e8 100644
--- a/src/auth/auth-request-fields.c
+++ b/src/auth/auth-request-fields.c
@@ -387,3 +387,18 @@ bool auth_request_set_login_username(struct auth_request *request,
 		request->fields.requested_login_user);
 	return TRUE;
 }
+
+void auth_request_master_user_login_finish(struct auth_request *request)
+{
+	if (request->failed)
+		return;
+
+	/* master login successful. update user and master_user variables. */
+	e_info(authdb_event(request),
+	       "Master user logging in as %s",
+	       request->fields.requested_login_user);
+
+	request->fields.master_user = request->fields.user;
+	request->fields.user = request->fields.requested_login_user;
+	request->fields.requested_login_user = NULL;
+}
diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index dccc85abe7..7686f386cf 100644
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -523,21 +523,6 @@ static void auth_request_save_cache(struct auth_request *request,
 			  result == PASSDB_RESULT_OK);
 }
 
-static void auth_request_master_lookup_finish(struct auth_request *request)
-{
-	if (request->failed)
-		return;
-
-	/* master login successful. update user and master_user variables. */
-	e_info(authdb_event(request),
-	       "Master user logging in as %s",
-	       request->fields.requested_login_user);
-
-	request->fields.master_user = request->fields.user;
-	request->fields.user = request->fields.requested_login_user;
-	request->fields.requested_login_user = NULL;
-}
-
 static bool
 auth_request_mechanism_accepted(const char *const *mechs,
 				const struct mech_module *mech)
@@ -851,7 +836,7 @@ auth_request_handle_passdb_callback(enum passdb_result *result,
 
 	if (request->fields.requested_login_user != NULL &&
 	    *result == PASSDB_RESULT_OK) {
-		auth_request_master_lookup_finish(request);
+		auth_request_master_user_login_finish(request);
 		/* if the passdb lookup continues, it continues with non-master
 		   passdbs for the requested_login_user. */
 		next_passdb = auth_request_get_auth(request)->passdbs;
diff --git a/src/auth/auth-request.h b/src/auth/auth-request.h
index 1c4de48912..b02029e05a 100644
--- a/src/auth/auth-request.h
+++ b/src/auth/auth-request.h
@@ -313,6 +313,7 @@ bool auth_request_username_accepted(const char *const *filter, const char *usern
 struct event_passthrough *
 auth_request_finished_event(struct auth_request *request, struct event *event);
 void auth_request_log_finished(struct auth_request *request);
+void auth_request_master_user_login_finish(struct auth_request *request);
 const char *auth_request_get_log_prefix_db(struct auth_request *auth_request);
 
 void auth_request_passdb_lookup_begin(struct auth_request *request);