auth: If passdb/userdb ldap has blocking=yes, auth master shouldn't c…

…onnect to ldap
dovecot · May 16, 2017 · e73fbb6 · e73fbb6
1 parent b383ed5
commit e73fbb6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/auth/passdb-ldap.c b/src/auth/passdb-ldap.c
@@ -492,7 +492,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
@@ -304,7 +304,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)