]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
auth: Move auth_request_init_userdb_reply() to auth-request-fields.c
authorTimo Sirainen <timo.sirainen@open-xchange.com>
Tue, 4 Aug 2020 11:22:16 +0000 (14:22 +0300)
committeraki.tuomi <aki.tuomi@open-xchange.com>
Thu, 27 Aug 2020 06:20:17 +0000 (06:20 +0000)
src/auth/auth-request-fields.c
src/auth/auth-request.c

index e824d25b26f31ae0dda5876f69ffed01c0d16172..e3a9519f39ffd104a94badbcc8766c26b5c6e548 100644 (file)
@@ -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);
+       }
+}
index 6cb3479bc49913c16926630dd3e79eef72e56b29..a0518ce5e491ac1f5d6392d13359aeedd101789e 100644 (file)
@@ -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)
 {