Mercurial > dovecot > core-2.2
changeset 19300:727acba74cbf
auth ldap: If tls_* settings are used, pass them to LDAP library even if tls=no
Most importantly this allows using the settings for ldaps URLs. And they
hopefully won't hurt anything if neither STARTTLS nor ldaps are used.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Tue, 13 Oct 2015 21:21:48 +0300 |
| parents | b0545670fd99 |
| children | 5e48c5a29ddd |
| files | src/auth/db-ldap.c |
| diffstat | 1 files changed, 0 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auth/db-ldap.c Tue Oct 13 20:41:36 2015 +0300 +++ b/src/auth/db-ldap.c Tue Oct 13 21:21:48 2015 +0300 @@ -1064,9 +1064,6 @@ static void db_ldap_set_tls_options(struct ldap_connection *conn) { - if (!conn->set.tls) - return; - #ifdef OPENLDAP_TLS_OPTIONS db_ldap_set_opt_str(conn, NULL, LDAP_OPT_X_TLS_CACERTFILE, conn->set.tls_ca_cert_file, "tls_ca_cert_file");