From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 22 Jul 2019 03:10:37 +0000 (+0000)
Subject: Revert "ITS#8427 Only do StartTLS if configured"
X-Git-Tag: OPENLDAP_REL_ENG_2_4_48~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33d4c153207bf2fac9b652f434005b7e9ac692a0;p=thirdparty%2Fopenldap.git

Revert "ITS#8427 Only do StartTLS if configured"

This reverts commit 653922c5051e1e6901d4b787a37494a433cd31a4.
---

diff --git a/servers/slapd/back-meta/conn.c b/servers/slapd/back-meta/conn.c
index a32ddabd1b..22cadb7000 100644
--- a/servers/slapd/back-meta/conn.c
+++ b/servers/slapd/back-meta/conn.c
@@ -436,7 +436,10 @@ retry_lock:;
 		bindconf_tls_set( sb, msc->msc_ld );
 
 		if ( !is_ldaps ) {
-			if ( META_BACK_TGT_USE_TLS( mt )
+			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;