upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-17 17:48:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#8022 don't skip TLS init for ldaps:// targets

Browse source
This commit is contained in:
Howard Chu 2015-01-12 22:25:15 +00:00
parent fa255d0fed
commit 6046584531
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
servers/slapd/back-meta/conn.c
View file

@ -424,7 +424,7 @@ retry_lock:;
slap_client_keepalive(msc->msc_ld, &mt->mt_tls.sb_keepalive);
#ifdef HAVE_TLS
if ( !is_ldaps ) {
{
slap_bindconf *sb = NULL;
if ( ispriv ) {
@ -439,13 +439,15 @@ retry_lock:;
ldap_set_option( msc->msc_ld, LDAP_OPT_X_TLS_CTX, sb->sb_tls_ctx );
}
if ( sb == &mt->mt_idassert.si_bc && sb->sb_tls_ctx ) {
do_start_tls = 1;
if ( !is_ldaps ) {
if ( sb == &mt->mt_idassert.si_bc && sb->sb_tls_ctx ) {
do_start_tls = 1;
} else if ( META_BACK_TGT_USE_TLS( mt )
|| ( op->o_conn->c_is_tls && META_BACK_TGT_PROPAGATE_TLS( mt ) ) )
{
do_start_tls = 1;
} else if ( META_BACK_TGT_USE_TLS( mt )
|| ( op->o_conn->c_is_tls && META_BACK_TGT_PROPAGATE_TLS( mt ) ) )
{
do_start_tls = 1;
}
}
}