dovecot-2.2: auth ldap: If tls_* settings are used, pass them to...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/727acba74cbf
changeset: 19300:727acba74cbf
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Oct 13 21:21:48 2015 +0300
description:
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.

diffstat:

 src/auth/db-ldap.c |  3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diffs (13 lines):

diff -r b0545670fd99 -r 727acba74cbf src/auth/db-ldap.c
--- 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");