dovecot-2.2: auth: Renamed userdb_userdb_import to passdb_import...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/963c6f616aa4
changeset: 16188:963c6f616aa4
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Mar 31 17:44:34 2013 +0300
description:
auth: Renamed userdb_userdb_import to passdb_import, since that's what it really is.

diffstat:

 src/auth/auth-request.c |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (31 lines):

diff -r cd919c490ea6 -r 963c6f616aa4 src/auth/auth-request.c
--- a/src/auth/auth-request.c	Sun Mar 31 17:40:12 2013 +0300
+++ b/src/auth/auth-request.c	Sun Mar 31 17:44:34 2013 +0300
@@ -1243,8 +1243,8 @@
 }
 
 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 @@
 		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);