From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 4 Aug 2020 11:22:16 +0000 (+0300)
Subject: auth: Move auth_request_init_userdb_reply() to auth-request-fields.c
X-Git-Tag: 2.3.13~317
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=544781e8d4957a6fafe17f152a4fa747fed78cd2;p=thirdparty%2Fdovecot%2Fcore.git

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

diff --git a/src/auth/auth-request-fields.c b/src/auth/auth-request-fields.c
index e824d25b26..e3a9519f39 100644
--- a/src/auth/auth-request-fields.c
+++ b/src/auth/auth-request-fields.c
@@ -5,6 +5,7 @@
 #include "strescape.h"
 #include "str-sanitize.h"
 #include "auth-request.h"
+#include "userdb-template.h"
 
 void auth_request_fields_init(struct auth_request *request)
 {
@@ -442,3 +443,15 @@ void auth_request_set_password_verified(struct auth_request *request)
 {
 	request->fields.skip_password_check = TRUE;
 }
+
+void auth_request_init_userdb_reply(struct auth_request *request)
+{
+	const char *error;
+
+	request->fields.userdb_reply = auth_fields_init(request->pool);
+	if (userdb_template_export(request->userdb->default_fields_tmpl,
+				   request, &error) < 0) {
+		e_error(authdb_event(request),
+			"Failed to expand default_fields: %s", error);
+	}
+}
diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index 6cb3479bc4..a0518ce5e4 100644
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -1919,18 +1919,6 @@ void auth_request_set_fields(struct auth_request *request,
 	}
 }
 
-void auth_request_init_userdb_reply(struct auth_request *request)
-{
-	const char *error;
-
-	request->fields.userdb_reply = auth_fields_init(request->pool);
-	if (userdb_template_export(request->userdb->default_fields_tmpl,
-				   request, &error) < 0) {
-		e_error(authdb_event(request),
-			"Failed to expand default_fields: %s", error);
-	}
-}
-
 static void auth_request_set_uidgid_file(struct auth_request *request,
 					 const char *path_template)
 {