From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 16 May 2017 14:53:23 +0000 (+0300)
Subject: auth: If passdb/userdb ldap has blocking=yes, auth master shouldn't connect to ldap
X-Git-Tag: 2.2.30.rc1~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88bb9783d8399d61d0feb7de41221253a268ec96;p=thirdparty%2Fdovecot%2Fcore.git

auth: If passdb/userdb ldap has blocking=yes, auth master shouldn't connect to ldap
---

diff --git a/src/auth/passdb-ldap.c b/src/auth/passdb-ldap.c
index 79f8127814..68093a1d9e 100644
--- a/src/auth/passdb-ldap.c
+++ b/src/auth/passdb-ldap.c
@@ -450,7 +450,8 @@ static void passdb_ldap_init(struct passdb_module *_module)
 	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 --git a/src/auth/userdb-ldap.c b/src/auth/userdb-ldap.c
index 90bf531a5d..e65945d964 100644
--- a/src/auth/userdb-ldap.c
+++ b/src/auth/userdb-ldap.c
@@ -279,7 +279,8 @@ static void userdb_ldap_init(struct userdb_module *_module)
 	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)