mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-04-12 15:10:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ITS#9952 libldap: use atexit for TLS teardown"

Browse Source 
This reverts commit 337455eb3a66176cc3f66d2c663a72cc7b4178bd.
The change was non-portable, caused ITS#10176. OpenSSL 3 is
broken and should be fixed.
This commit is contained in:
Howard Chu 2024-02-13 17:29:05 +00:00 committed by Quanah Gibson-Mount
parent d7810ffb5d
commit dcbd0113bc
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/libldap/init.c
View File

@ -544,6 +544,9 @@ ldap_int_destroy_global_options(void)
gopts->ldo_def_sasl_authcid = NULL;
}
#endif
#ifdef HAVE_TLS
ldap_int_tls_destroy( gopts );
#endif
}
/*

14
libraries/libldap/tls2.c
View File

@ -160,14 +160,6 @@ ldap_pvt_tls_destroy( void )
tls_imp->ti_tls_destroy();
}
static void
ldap_exit_tls_destroy( void )
{
struct ldapoptions *lo = LDAP_INT_GLOBAL_OPT();
ldap_int_tls_destroy( lo );
}
/*
* Initialize a particular TLS implementation.
* Called once per implementation.
@ -176,7 +168,6 @@ static int
tls_init(tls_impl *impl, int do_threads )
{
static int tls_initialized = 0;
int rc;
if ( !tls_initialized++ ) {
#ifdef LDAP_R_COMPILE
@ -192,10 +183,7 @@ tls_init(tls_impl *impl, int do_threads )
#endif
}
rc = impl->ti_tls_init();
atexit( ldap_exit_tls_destroy );
return rc;
return impl->ti_tls_init();
}
/*