From: Timo Sirainen 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.3.0.rc1~1623 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e73fbb6673433e8dd6d67a5873ecec0634734248;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 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)