ITS#8353, ITS#8533 - Cleanup for libldap_r

diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
index 8a83766c0348a42835224625ae1f2219a32ecf94..795278d30d694052c4eb71f0ada97f073940a7a9 100644 (file)
--- 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,