]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
auth: Renamed userdb_userdb_import to passdb_import, since that's what it really is.
authorTimo Sirainen <tss@iki.fi>
Sun, 31 Mar 2013 14:44:34 +0000 (17:44 +0300)
committerTimo Sirainen <tss@iki.fi>
Sun, 31 Mar 2013 14:44:34 +0000 (17:44 +0300)
src/auth/auth-request.c

index 9ceeeae24e4a0db1f95034fc25fe170cdfebe956..347288a55dec2dd19afac9d9de49819f08d052d2 100644 (file)
@@ -1243,8 +1243,8 @@ auth_request_try_update_username(struct auth_request *request,
 }
 
 static void
-auth_request_userdb_userdb_import(struct auth_request *request,
-                                 const char *args, const char *default_scheme)
+auth_request_passdb_import(struct auth_request *request,
+                          const char *args, const char *default_scheme)
 {
        const char *key, *value, *const *arg = t_strsplit(args, "\t");
 
@@ -1301,13 +1301,11 @@ void auth_request_set_field(struct auth_request *request,
                request->passdb_password = NULL;
        } else if (strcmp(name, "allow_nets") == 0) {
                auth_request_validate_networks(request, value);
+       } else if (strcmp(name, "passdb_import") == 0) {
+               auth_request_passdb_import(request, value, default_scheme);
+               return;
        } else if (strncmp(name, "userdb_", 7) == 0) {
                /* for prefetch userdb */
-               if (strcmp(name, "userdb_userdb_import") == 0) {
-                       auth_request_userdb_userdb_import(request, value,
-                                                         default_scheme);
-                       return;
-               }
                if (request->userdb_reply == NULL)
                        auth_request_init_userdb_reply(request);
                auth_request_set_userdb_field(request, name + 7, value);