summaryrefslogtreecommitdiffstats
path: root/libraries/libldap/tls2.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-03 05:34:56 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-03 05:34:56 +0000
commit3fa3e6ac17cbab8003ce3b3ae87928de5f5eaaf4 (patch)
tree1fa47166862724850b871e1900513bf04d3c1cc2 /libraries/libldap/tls2.c
parentAdding upstream version 2.6.7+dfsg. (diff)
downloadopenldap-upstream.tar.xz
openldap-upstream.zip
Adding upstream version 2.6.8+dfsg.upstream/2.6.8+dfsgupstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--libraries/libldap/tls2.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
index 4bfc346..dea46de 100644
--- a/libraries/libldap/tls2.c
+++ b/libraries/libldap/tls2.c
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2022 The OpenLDAP Foundation.
+ * Copyright 1998-2024 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -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();
}
/*