Mercurial > dovecot > original-hg > dovecot-1.0
changeset 5529:50be791dc276 branch_1_0
If tls=yes is used, use ldap_version=3 automatically.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Wed, 05 Mar 2008 00:56:28 +0200 |
| parents | a9ac53bc191b |
| children | c81845f90020 |
| files | src/auth/db-ldap.c |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auth/db-ldap.c Wed Mar 05 00:37:12 2008 +0200 +++ b/src/auth/db-ldap.c Wed Mar 05 00:56:28 2008 +0200 @@ -556,9 +556,9 @@ ldap_err2string(ret)); } - /* If SASL binds are used, the protocol version needs to be - at least 3 */ - ldap_version = conn->set.sasl_bind && + /* If SASL binds or TLS is used, the protocol version needs + to be at least 3 */ + ldap_version = (conn->set.sasl_bind || conn->set.tls) && conn->set.ldap_version < 3 ? 3 : conn->set.ldap_version; ret = ldap_set_option(conn->ld, LDAP_OPT_PROTOCOL_VERSION,