Mercurial > dovecot > core-2.2
changeset 22045:ba0cb10b2845
auth: If passdb/userdb ldap has blocking=yes, auth master shouldn't connect to ldap
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Tue, 16 May 2017 17:53:23 +0300 |
| parents | c73b9f07b067 |
| children | f4076be3efe9 |
| files | src/auth/passdb-ldap.c src/auth/userdb-ldap.c |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auth/passdb-ldap.c Thu May 18 11:57:38 2017 +0300 +++ b/src/auth/passdb-ldap.c Tue May 16 17:53:23 2017 +0300 @@ -450,7 +450,8 @@ 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)
--- a/src/auth/userdb-ldap.c Thu May 18 11:57:38 2017 +0300 +++ b/src/auth/userdb-ldap.c Tue May 16 17:53:23 2017 +0300 @@ -279,7 +279,8 @@ 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)