From 02df0b485a69fc8393c1fbccc3ae278022b8ac0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= Date: Thu, 13 Jun 2019 12:12:54 +0200 Subject: [PATCH] ITS#8427 Only do StartTLS if configured --- servers/slapd/back-asyncmeta/conn.c | 5 +---- servers/slapd/back-meta/conn.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/servers/slapd/back-asyncmeta/conn.c b/servers/slapd/back-asyncmeta/conn.c index 64a852098a..eeac2a1114 100644 --- a/servers/slapd/back-asyncmeta/conn.c +++ b/servers/slapd/back-asyncmeta/conn.c @@ -227,10 +227,7 @@ asyncmeta_init_one_conn( bindconf_tls_set( sb, msc->msc_ld ); 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 ) + if ( META_BACK_TGT_USE_TLS( mt ) || ( op->o_conn->c_is_tls && META_BACK_TGT_PROPAGATE_TLS( mt ) ) ) { do_start_tls = 1; diff --git a/servers/slapd/back-meta/conn.c b/servers/slapd/back-meta/conn.c index 6696725ac8..e93fac7772 100644 --- a/servers/slapd/back-meta/conn.c +++ b/servers/slapd/back-meta/conn.c @@ -431,10 +431,7 @@ retry_lock:; bindconf_tls_set( sb, msc->msc_ld ); 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 ) + if ( META_BACK_TGT_USE_TLS( mt ) || ( op->o_conn->c_is_tls && META_BACK_TGT_PROPAGATE_TLS( mt ) ) ) { do_start_tls = 1;