From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 3 Aug 2020 14:16:12 +0000 (+0300)
Subject: auth: Move auth_request_fields initialization code to auth_request_fields_init()
X-Git-Tag: 2.3.13~324
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6bf74fbc35da506055baf2a64503a0a2fcad28f4;p=thirdparty%2Fdovecot%2Fcore.git

auth: Move auth_request_fields initialization code to auth_request_fields_init()
---

diff --git a/src/auth/auth-request-fields.c b/src/auth/auth-request-fields.c
index 26c62077e8..53e01cd16b 100644
--- a/src/auth/auth-request-fields.c
+++ b/src/auth/auth-request-fields.c
@@ -6,6 +6,15 @@
 #include "str-sanitize.h"
 #include "auth-request.h"
 
+void auth_request_fields_init(struct auth_request *request)
+{
+	request->fields.extra_fields = auth_fields_init(request->pool);
+	if (request->mech != NULL) {
+		request->fields.mech_name = request->mech->mech_name;
+		event_add_str(request->event, "mech", request->mech->mech_name);
+	}
+}
+
 static void
 auth_str_add_keyvalue(string_t *dest, const char *key, const char *value)
 {
diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index 7686f386cf..08d34db009 100644
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -107,9 +107,9 @@ static void auth_request_post_alloc_init(struct auth_request *request, struct ev
 	request->last_access = ioloop_time;
 	request->session_pid = (pid_t)-1;
 	request->set = global_auth_settings;
-	request->fields.extra_fields = auth_fields_init(request->pool);
 	request->event = event_create(parent_event);
 	request->mech_event = event_create(request->event);
+	auth_request_fields_init(request);
 
 	level = request->set->verbose ? LOG_TYPE_INFO : LOG_TYPE_WARNING;
 	event_set_min_log_level(request->event, level);
@@ -128,10 +128,8 @@ auth_request_new(const struct mech_module *mech, struct event *parent_event)
 	struct auth_request *request;
 
 	request = mech->auth_new();
-	auth_request_post_alloc_init(request, parent_event);
 	request->mech = mech;
-	request->fields.mech_name = mech->mech_name;
-	event_add_str(request->event, "mech", request->mech->mech_name);
+	auth_request_post_alloc_init(request, parent_event);
 
 	return request;
 }
diff --git a/src/auth/auth-request.h b/src/auth/auth-request.h
index b02029e05a..2c91517e9f 100644
--- a/src/auth/auth-request.h
+++ b/src/auth/auth-request.h
@@ -315,6 +315,7 @@ 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_fields_init(struct auth_request *request);
 
 void auth_request_passdb_lookup_begin(struct auth_request *request);
 void auth_request_passdb_lookup_end(struct auth_request *request,