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 1627d43825fbeeac4daa7086bd293950b36ca3c3..c25a49aa7aa460cb6d0715558ae3b5ac2ca684bb 100644 (file)
--- 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
index d8121f129d547bb5c72a4b327e1e215904d0dc46..675b30a6cbc9a0d7b6ad890fe834bcc3b988a7cc 100644 (file)
--- 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)