From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 22 Jul 2019 03:10:27 +0000 (+0000)
Subject: Revert "ITS#8427 Take late TLS configuration into account"
X-Git-Tag: OPENLDAP_REL_ENG_2_4_48~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ca56bd399b16456e5c60ff6a5f3154f4dbe9edf;p=thirdparty%2Fopenldap.git

Revert "ITS#8427 Take late TLS configuration into account"

This reverts commit e224920ea5641b71bbd38604cb58bd1922537e7d.
---

diff --git a/servers/slapd/back-ldap/config.c b/servers/slapd/back-ldap/config.c
index 33f1cb0f29..c2f59439a5 100644
--- a/servers/slapd/back-ldap/config.c
+++ b/servers/slapd/back-ldap/config.c
@@ -942,10 +942,6 @@ slap_idassert_parse( ConfigArgs *c, slap_idassert_t *si )
 	}
 
 	bindconf_tls_defaults( &si->si_bc );
-	if ( si->si_bc.sb_tls_ctx ) {
-		ldap_pvt_tls_ctx_free( si->si_bc.sb_tls_ctx );
-		si->si_bc.sb_tls_ctx = NULL;
-	}
 
 	return 0;
 }
@@ -1750,10 +1746,6 @@ done_url:;
 			}
 			bindconf_tls_defaults( &li->li_tls );
 		}
-		if ( li->li_tls.sb_tls_ctx ) {
-			ldap_pvt_tls_ctx_free( li->li_tls.sb_tls_ctx );
-			li->li_tls.sb_tls_ctx = NULL;
-		}
 		break;
 
 	case LDAP_BACK_CFG_ACL_AUTHCDN:
@@ -1813,10 +1805,6 @@ done_url:;
 			}
 		}
 		bindconf_tls_defaults( &li->li_acl );
-		if ( li->li_acl.sb_tls_ctx ) {
-			ldap_pvt_tls_ctx_free( li->li_acl.sb_tls_ctx );
-			li->li_acl.sb_tls_ctx = NULL;
-		}
 		break;
 
 	case LDAP_BACK_CFG_IDASSERT_MODE: