# HG changeset patch
# User Timo Sirainen <timo.sirainen@dovecot.fi>
# Date 1494946403 -10800
# Node ID ba0cb10b28458366cfebd27aad88f2c1e7a7475b
# Parent  c73b9f07b06742d0c0e7344783aae917a4f27fb9
auth: If passdb/userdb ldap has blocking=yes, auth master shouldn't connect to ldap

diff -r c73b9f07b067 -r ba0cb10b2845 src/auth/passdb-ldap.c
--- a/src/auth/passdb-ldap.c	Thu May 18 11:57:38 2017 +0300
+++ b/src/auth/passdb-ldap.c	Tue May 16 17:53:23 2017 +0300
@@ -450,7 +450,8 @@
 	struct ldap_passdb_module *module =
 		(struct ldap_passdb_module *)_module;
 
-	db_ldap_connect_delayed(module->conn);
+	if (!module->module.blocking || worker)
+		db_ldap_connect_delayed(module->conn);
 }
 
 static void passdb_ldap_deinit(struct passdb_module *_module)
diff -r c73b9f07b067 -r ba0cb10b2845 src/auth/userdb-ldap.c
--- a/src/auth/userdb-ldap.c	Thu May 18 11:57:38 2017 +0300
+++ b/src/auth/userdb-ldap.c	Tue May 16 17:53:23 2017 +0300
@@ -279,7 +279,8 @@
 	struct ldap_userdb_module *module =
 		(struct ldap_userdb_module *)_module;
 
-	db_ldap_connect_delayed(module->conn);
+	if (!module->module.blocking || worker)
+		db_ldap_connect_delayed(module->conn);
 }
 
 static void userdb_ldap_deinit(struct userdb_module *_module)