From e73fbb6673433e8dd6d67a5873ecec0634734248 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Tue, 16 May 2017 17:53:23 +0300 Subject: [PATCH] auth: If passdb/userdb ldap has blocking=yes, auth master shouldn't connect to ldap --- src/auth/passdb-ldap.c | 3 ++- src/auth/userdb-ldap.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/auth/passdb-ldap.c b/src/auth/passdb-ldap.c index 1627d43825..c25a49aa7a 100644 --- 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 d8121f129d..675b30a6cb 100644 --- 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) -- 2.47.3