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 79f81278149edcf84e30e3988f87765d06996959..68093a1d9ee5ffe72239cd29451831a0d607cd9b 100644 (file)
--- 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 90bf531a5d4ba6229e91abaed6926b34df552023..e65945d964e13a09cc491567da63943b81fcc7a8 100644 (file)
--- 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)