From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 7 Apr 2017 20:39:11 +0000 (-0700)
Subject: ITS#8353, ITS#8533 - Cleanup for libldap_r
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=eb8f1a7247988cdde34f8d02325c4dc22d146c0d;p=openldap

ITS#8353, ITS#8533 - Cleanup for libldap_r
---

diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
index 8a83766c03..795278d30d 100644
--- a/libraries/libldap/tls_o.c
+++ b/libraries/libldap/tls_o.c
@@ -107,6 +107,10 @@ static void tlso_thr_init( void )
 	CRYPTO_set_id_callback( tlso_thread_self );
 }
 #endif /* LDAP_R_COMPILE */
+#else
+#ifdef LDAP_R_COMPILE
+static void tlso_thr_init( void ) {}
+#endif
 #endif /* OpenSSL 1.1 */
 
 static STACK_OF(X509_NAME) *
@@ -1317,7 +1321,7 @@ tls_impl ldap_int_tls_impl = {
 
 	&tlso_sbio,
 
-#if defined(LDAP_R_COMPILE) && OPENSSL_VERSION_NUMBER < 0x10100000
+#ifdef LDAP_R_COMPILE
 	tlso_thr_init,
 #else
 	NULL,