From: Timo Sirainen <tss@iki.fi>
Date: Tue, 2 Nov 2010 15:39:28 +0000 (+0000)
Subject: auth: vpopmail passdb/userdb uses now auth-worker processes by default.
X-Git-Tag: 2.0.7~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c64e714193097f841691dcfa2902c270cb47bff8;p=thirdparty%2Fdovecot%2Fcore.git

auth: vpopmail passdb/userdb uses now auth-worker processes by default.
Adding blocking=no parameter disables this.
---

diff --git a/src/auth/passdb-vpopmail.c b/src/auth/passdb-vpopmail.c
index 94bcae2c82..ec56f25aa4 100644
--- a/src/auth/passdb-vpopmail.c
+++ b/src/auth/passdb-vpopmail.c
@@ -167,6 +167,7 @@ vpopmail_preinit(pool_t pool, const char *args)
 
 	module = p_new(pool, struct vpopmail_passdb_module, 1);
 	module->module.default_pass_scheme = VPOPMAIL_DEFAULT_PASS_SCHEME;
+	module->module.blocking = TRUE;
 
 	tmp = t_strsplit_spaces(args, " ");
 	for (; *tmp != NULL; tmp++) {
@@ -176,6 +177,8 @@ vpopmail_preinit(pool_t pool, const char *args)
 		} else if (strncmp(*tmp, "webmail=", 8) == 0) {
 			if (net_addr2ip(*tmp + 8, &module->webmail_ip) < 0)
 				i_fatal("vpopmail: Invalid webmail IP address");
+		} else if (strcmp(*tmp, "blocking=no") == 0) {
+			module->module.blocking = FALSE;
 		} else {
 			i_fatal("passdb vpopmail: Unknown setting: %s", *tmp);
 		}
diff --git a/src/auth/userdb-vpopmail.c b/src/auth/userdb-vpopmail.c
index 9aeada287e..6333eef328 100644
--- a/src/auth/userdb-vpopmail.c
+++ b/src/auth/userdb-vpopmail.c
@@ -143,6 +143,7 @@ vpopmail_preinit(pool_t pool, const char *args)
 	const char *const *tmp, *p;
 
 	module = p_new(pool, struct vpopmail_userdb_module, 1);
+	module->module.blocking = TRUE;
 
 	for (tmp = t_strsplit(args, " "); *tmp != NULL; tmp++) {
 		if (strncmp(*tmp, "cache_key=", 10) == 0)
@@ -156,6 +157,8 @@ vpopmail_preinit(pool_t pool, const char *args)
 			module->quota_template_key =
 				p_strdup_until(pool, *tmp + 15, p);
 			module->quota_template_value = p_strdup(pool, p + 1);
+		} else if (strcmp(*tmp, "blocking=no") == 0) {
+			module->module.blocking = FALSE;
 		} else
 			i_fatal("userdb vpopmail: Unknown setting: %s", *tmp);
 	}