summaryrefslogtreecommitdiffstats
path: root/libraries/libldap
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/libldap')
-rw-r--r--libraries/libldap/Makefile.in2
-rw-r--r--libraries/libldap/abandon.c2
-rw-r--r--libraries/libldap/account_usability.c2
-rw-r--r--libraries/libldap/add.c2
-rw-r--r--libraries/libldap/addentry.c2
-rw-r--r--libraries/libldap/apitest.c2
-rw-r--r--libraries/libldap/assertion.c2
-rw-r--r--libraries/libldap/avl.c2
-rw-r--r--libraries/libldap/bind.c2
-rw-r--r--libraries/libldap/cancel.c2
-rw-r--r--libraries/libldap/charray.c2
-rw-r--r--libraries/libldap/compare.c2
-rw-r--r--libraries/libldap/controls.c2
-rw-r--r--libraries/libldap/cyrus.c2
-rw-r--r--libraries/libldap/dds.c2
-rw-r--r--libraries/libldap/delete.c2
-rw-r--r--libraries/libldap/deref.c2
-rw-r--r--libraries/libldap/dnssrv.c2
-rw-r--r--libraries/libldap/dntest.c2
-rw-r--r--libraries/libldap/error.c2
-rw-r--r--libraries/libldap/extended.c2
-rw-r--r--libraries/libldap/fetch.c2
-rw-r--r--libraries/libldap/filter.c2
-rw-r--r--libraries/libldap/free.c2
-rw-r--r--libraries/libldap/ftest.c2
-rw-r--r--libraries/libldap/getattr.c2
-rw-r--r--libraries/libldap/getdn.c2
-rw-r--r--libraries/libldap/getentry.c2
-rw-r--r--libraries/libldap/getvalues.c2
-rw-r--r--libraries/libldap/init.c5
-rw-r--r--libraries/libldap/lbase64.c2
-rw-r--r--libraries/libldap/ldap-int.h2
-rw-r--r--libraries/libldap/ldap-tls.h2
-rw-r--r--libraries/libldap/ldap_sync.c2
-rw-r--r--libraries/libldap/ldap_thr_debug.h2
-rw-r--r--libraries/libldap/ldif.c2
-rw-r--r--libraries/libldap/ldifutil.c2
-rw-r--r--libraries/libldap/messages.c2
-rw-r--r--libraries/libldap/modify.c2
-rw-r--r--libraries/libldap/modrdn.c2
-rw-r--r--libraries/libldap/msctrl.c2
-rw-r--r--libraries/libldap/open.c2
-rw-r--r--libraries/libldap/options.c2
-rw-r--r--libraries/libldap/os-ip.c2
-rw-r--r--libraries/libldap/os-local.c2
-rw-r--r--libraries/libldap/pagectrl.c2
-rw-r--r--libraries/libldap/passwd.c2
-rw-r--r--libraries/libldap/ppolicy.c2
-rw-r--r--libraries/libldap/print.c2
-rw-r--r--libraries/libldap/psearchctrl.c2
-rw-r--r--libraries/libldap/rdwr.c2
-rw-r--r--libraries/libldap/references.c2
-rw-r--r--libraries/libldap/request.c2
-rw-r--r--libraries/libldap/result.c2
-rw-r--r--libraries/libldap/rq.c2
-rw-r--r--libraries/libldap/sasl.c2
-rw-r--r--libraries/libldap/sbind.c2
-rw-r--r--libraries/libldap/schema.c2
-rw-r--r--libraries/libldap/search.c2
-rw-r--r--libraries/libldap/sort.c2
-rw-r--r--libraries/libldap/sortctrl.c2
-rw-r--r--libraries/libldap/stctrl.c2
-rw-r--r--libraries/libldap/string.c2
-rw-r--r--libraries/libldap/t61.c2
-rw-r--r--libraries/libldap/tavl.c2
-rw-r--r--libraries/libldap/test.c2
-rw-r--r--libraries/libldap/testavl.c2
-rw-r--r--libraries/libldap/testtavl.c2
-rw-r--r--libraries/libldap/thr_debug.c2
-rw-r--r--libraries/libldap/thr_nt.c2
-rw-r--r--libraries/libldap/thr_posix.c2
-rw-r--r--libraries/libldap/thr_pth.c2
-rw-r--r--libraries/libldap/thr_thr.c2
-rw-r--r--libraries/libldap/threads.c2
-rw-r--r--libraries/libldap/tls2.c16
-rw-r--r--libraries/libldap/tls_g.c2
-rw-r--r--libraries/libldap/tls_o.c18
-rw-r--r--libraries/libldap/tpool.c2
-rw-r--r--libraries/libldap/turn.c2
-rw-r--r--libraries/libldap/txn.c2
-rw-r--r--libraries/libldap/unbind.c2
-rw-r--r--libraries/libldap/url.c2
-rw-r--r--libraries/libldap/urltest.c2
-rw-r--r--libraries/libldap/utf-8-conv.c2
-rw-r--r--libraries/libldap/utf-8.c2
-rw-r--r--libraries/libldap/util-int.c2
-rw-r--r--libraries/libldap/vc.c2
-rw-r--r--libraries/libldap/vlvctrl.c2
-rw-r--r--libraries/libldap/whoami.c2
89 files changed, 107 insertions, 104 deletions
diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index 5d5c4c6..918e848 100644
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -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
diff --git a/libraries/libldap/abandon.c b/libraries/libldap/abandon.c
index 6161cc9..eef6936 100644
--- a/libraries/libldap/abandon.c
+++ b/libraries/libldap/abandon.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
diff --git a/libraries/libldap/account_usability.c b/libraries/libldap/account_usability.c
index 9cac6e6..5ebd8c3 100644
--- a/libraries/libldap/account_usability.c
+++ b/libraries/libldap/account_usability.c
@@ -1,7 +1,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2004-2022 The OpenLDAP Foundation.
+ * Copyright 2004-2024 The OpenLDAP Foundation.
* Portions Copyright 2004 Hewlett-Packard Company.
* Portions Copyright 2004 Howard Chu, Symas Corp.
* All rights reserved.
diff --git a/libraries/libldap/add.c b/libraries/libldap/add.c
index 7f63fa2..88ea90d 100644
--- a/libraries/libldap/add.c
+++ b/libraries/libldap/add.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
diff --git a/libraries/libldap/addentry.c b/libraries/libldap/addentry.c
index 14a8879..83a0d5c 100644
--- a/libraries/libldap/addentry.c
+++ b/libraries/libldap/addentry.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
diff --git a/libraries/libldap/apitest.c b/libraries/libldap/apitest.c
index a731087..547e20c 100644
--- a/libraries/libldap/apitest.c
+++ b/libraries/libldap/apitest.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.
* Portions Copyright 1998-2003 Kurt D. Zeilenga.
* All rights reserved.
*
diff --git a/libraries/libldap/assertion.c b/libraries/libldap/assertion.c
index 97ddb61..6a83bf1 100644
--- a/libraries/libldap/assertion.c
+++ b/libraries/libldap/assertion.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/avl.c b/libraries/libldap/avl.c
index fd22c7f..cd5c17f 100644
--- a/libraries/libldap/avl.c
+++ b/libraries/libldap/avl.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
diff --git a/libraries/libldap/bind.c b/libraries/libldap/bind.c
index ea6fe5c..129a215 100644
--- a/libraries/libldap/bind.c
+++ b/libraries/libldap/bind.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
diff --git a/libraries/libldap/cancel.c b/libraries/libldap/cancel.c
index cfb4ba1..55a4eb1 100644
--- a/libraries/libldap/cancel.c
+++ b/libraries/libldap/cancel.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/charray.c b/libraries/libldap/charray.c
index 856843f..a441ea2 100644
--- a/libraries/libldap/charray.c
+++ b/libraries/libldap/charray.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
diff --git a/libraries/libldap/compare.c b/libraries/libldap/compare.c
index 86285c6..088a294 100644
--- a/libraries/libldap/compare.c
+++ b/libraries/libldap/compare.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/controls.c b/libraries/libldap/controls.c
index 125707e..e43cd2c 100644
--- a/libraries/libldap/controls.c
+++ b/libraries/libldap/controls.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index e713e58..e393365 100644
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/dds.c b/libraries/libldap/dds.c
index 7244d05..cede743 100644
--- a/libraries/libldap/dds.c
+++ b/libraries/libldap/dds.c
@@ -1,7 +1,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2005-2022 The OpenLDAP Foundation.
+ * Copyright 2005-2024 The OpenLDAP Foundation.
* Portions Copyright 2005-2006 SysNet s.n.c.
* All rights reserved.
*
diff --git a/libraries/libldap/delete.c b/libraries/libldap/delete.c
index b086f97..7b3ce8d 100644
--- a/libraries/libldap/delete.c
+++ b/libraries/libldap/delete.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/deref.c b/libraries/libldap/deref.c
index f187a9f..d63405b 100644
--- a/libraries/libldap/deref.c
+++ b/libraries/libldap/deref.c
@@ -1,7 +1,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.
* Portions Copyright 2008 Pierangelo Masarati.
* All rights reserved.
*
diff --git a/libraries/libldap/dnssrv.c b/libraries/libldap/dnssrv.c
index 433c37f..1971b48 100644
--- a/libraries/libldap/dnssrv.c
+++ b/libraries/libldap/dnssrv.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/dntest.c b/libraries/libldap/dntest.c
index b5d4e89..eb4db97 100644
--- a/libraries/libldap/dntest.c
+++ b/libraries/libldap/dntest.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
diff --git a/libraries/libldap/error.c b/libraries/libldap/error.c
index 444a024..297553d 100644
--- a/libraries/libldap/error.c
+++ b/libraries/libldap/error.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/extended.c b/libraries/libldap/extended.c
index b492fcd..7f58d7f 100644
--- a/libraries/libldap/extended.c
+++ b/libraries/libldap/extended.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/fetch.c b/libraries/libldap/fetch.c
index 536871b..b8cd049 100644
--- a/libraries/libldap/fetch.c
+++ b/libraries/libldap/fetch.c
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1999-2022 The OpenLDAP Foundation.
+ * Copyright 1999-2024 The OpenLDAP Foundation.
* Portions Copyright 1999-2003 Kurt D. Zeilenga.
* All rights reserved.
*
diff --git a/libraries/libldap/filter.c b/libraries/libldap/filter.c
index e158fd1..cfe0ffb 100644
--- a/libraries/libldap/filter.c
+++ b/libraries/libldap/filter.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
diff --git a/libraries/libldap/free.c b/libraries/libldap/free.c
index 4d09eee..b37b2e1 100644
--- a/libraries/libldap/free.c
+++ b/libraries/libldap/free.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
diff --git a/libraries/libldap/ftest.c b/libraries/libldap/ftest.c
index 445e89f..d7aaf93 100644
--- a/libraries/libldap/ftest.c
+++ b/libraries/libldap/ftest.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
diff --git a/libraries/libldap/getattr.c b/libraries/libldap/getattr.c
index 07398df..9f0e74e 100644
--- a/libraries/libldap/getattr.c
+++ b/libraries/libldap/getattr.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/getdn.c b/libraries/libldap/getdn.c
index 7d8b52f..f1bce2c 100644
--- a/libraries/libldap/getdn.c
+++ b/libraries/libldap/getdn.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/getentry.c b/libraries/libldap/getentry.c
index b812189..11f5ac0 100644
--- a/libraries/libldap/getentry.c
+++ b/libraries/libldap/getentry.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/getvalues.c b/libraries/libldap/getvalues.c
index b3ac190..61077b4 100644
--- a/libraries/libldap/getvalues.c
+++ b/libraries/libldap/getvalues.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index b991553..213276b 100644
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -1,7 +1,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
@@ -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
}
/*
diff --git a/libraries/libldap/lbase64.c b/libraries/libldap/lbase64.c
index aa4a622..90b1b20 100644
--- a/libraries/libldap/lbase64.c
+++ b/libraries/libldap/lbase64.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
diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index a401f27..3ef1764 100644
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -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
diff --git a/libraries/libldap/ldap-tls.h b/libraries/libldap/ldap-tls.h
index e2d7efc..cb3721a 100644
--- a/libraries/libldap/ldap-tls.h
+++ b/libraries/libldap/ldap-tls.h
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2008-2022 The OpenLDAP Foundation.
+ * Copyright 2008-2024 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/libraries/libldap/ldap_sync.c b/libraries/libldap/ldap_sync.c
index 6c99e3a..ce06a35 100644
--- a/libraries/libldap/ldap_sync.c
+++ b/libraries/libldap/ldap_sync.c
@@ -1,7 +1,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2006-2022 The OpenLDAP Foundation.
+ * Copyright 2006-2024 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/libraries/libldap/ldap_thr_debug.h b/libraries/libldap/ldap_thr_debug.h
index db6a052..b346337 100644
--- a/libraries/libldap/ldap_thr_debug.h
+++ b/libraries/libldap/ldap_thr_debug.h
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2005-2022 The OpenLDAP Foundation.
+ * Copyright 2005-2024 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/libraries/libldap/ldif.c b/libraries/libldap/ldif.c
index 57e44f8..3141a35 100644
--- a/libraries/libldap/ldif.c
+++ b/libraries/libldap/ldif.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
diff --git a/libraries/libldap/ldifutil.c b/libraries/libldap/ldifutil.c
index df557e5..24227eb 100644
--- a/libraries/libldap/ldifutil.c
+++ b/libraries/libldap/ldifutil.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/messages.c b/libraries/libldap/messages.c
index c4bf732..7092151 100644
--- a/libraries/libldap/messages.c
+++ b/libraries/libldap/messages.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
diff --git a/libraries/libldap/modify.c b/libraries/libldap/modify.c
index cb8d85a..02e11c8 100644
--- a/libraries/libldap/modify.c
+++ b/libraries/libldap/modify.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/modrdn.c b/libraries/libldap/modrdn.c
index 756762e..e22bb12 100644
--- a/libraries/libldap/modrdn.c
+++ b/libraries/libldap/modrdn.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/msctrl.c b/libraries/libldap/msctrl.c
index 0f9264e..6ded713 100644
--- a/libraries/libldap/msctrl.c
+++ b/libraries/libldap/msctrl.c
@@ -1,7 +1,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.
* Portions Copyright 2018 Howard Chu.
* All rights reserved.
*
diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 93720eb..58457c0 100644
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/options.c b/libraries/libldap/options.c
index 7a096ad..218d544 100644
--- a/libraries/libldap/options.c
+++ b/libraries/libldap/options.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index a84735e..6c86edd 100644
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.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.
* Portions Copyright 1999 Lars Uffmann.
* All rights reserved.
*
diff --git a/libraries/libldap/os-local.c b/libraries/libldap/os-local.c
index 8b31030..980326e 100644
--- a/libraries/libldap/os-local.c
+++ b/libraries/libldap/os-local.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
diff --git a/libraries/libldap/pagectrl.c b/libraries/libldap/pagectrl.c
index c7a1499..1668c96 100644
--- a/libraries/libldap/pagectrl.c
+++ b/libraries/libldap/pagectrl.c
@@ -1,7 +1,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.
* Copyright 2006 Hans Leidekker
* All rights reserved.
*
diff --git a/libraries/libldap/passwd.c b/libraries/libldap/passwd.c
index f529de5..42e15bc 100644
--- a/libraries/libldap/passwd.c
+++ b/libraries/libldap/passwd.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/ppolicy.c b/libraries/libldap/ppolicy.c
index dc93209..faf72ac 100644
--- a/libraries/libldap/ppolicy.c
+++ b/libraries/libldap/ppolicy.c
@@ -1,7 +1,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2004-2022 The OpenLDAP Foundation.
+ * Copyright 2004-2024 The OpenLDAP Foundation.
* Portions Copyright 2004 Hewlett-Packard Company.
* Portions Copyright 2004 Howard Chu, Symas Corp.
* All rights reserved.
diff --git a/libraries/libldap/print.c b/libraries/libldap/print.c
index 6f8681a..223750c 100644
--- a/libraries/libldap/print.c
+++ b/libraries/libldap/print.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/psearchctrl.c b/libraries/libldap/psearchctrl.c
index b465873..2552a5a 100644
--- a/libraries/libldap/psearchctrl.c
+++ b/libraries/libldap/psearchctrl.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/rdwr.c b/libraries/libldap/rdwr.c
index dde9403..50d4fb9 100644
--- a/libraries/libldap/rdwr.c
+++ b/libraries/libldap/rdwr.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/references.c b/libraries/libldap/references.c
index ee04e63..ca9cd01 100644
--- a/libraries/libldap/references.c
+++ b/libraries/libldap/references.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
diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index 850e31f..1fff2a4 100644
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index 40ff1c1..95dba93 100644
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.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
diff --git a/libraries/libldap/rq.c b/libraries/libldap/rq.c
index 6b16409..a5a72e0 100644
--- a/libraries/libldap/rq.c
+++ b/libraries/libldap/rq.c
@@ -1,7 +1,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2003-2022 The OpenLDAP Foundation.
+ * Copyright 2003-2024 The OpenLDAP Foundation.
* Portions Copyright 2003 IBM Corporation.
* All rights reserved.
*
diff --git a/libraries/libldap/sasl.c b/libraries/libldap/sasl.c
index fa5fc13..8c027b8 100644
--- a/libraries/libldap/sasl.c
+++ b/libraries/libldap/sasl.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/sbind.c b/libraries/libldap/sbind.c
index 420ac6a..eaec9e4 100644
--- a/libraries/libldap/sbind.c
+++ b/libraries/libldap/sbind.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/schema.c b/libraries/libldap/schema.c
index a4b89fa..6df8661 100644
--- a/libraries/libldap/schema.c
+++ b/libraries/libldap/schema.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index 2381577..cbf2e62 100644
--- a/libraries/libldap/search.c
+++ b/libraries/libldap/search.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/sort.c b/libraries/libldap/sort.c
index 6159be8..810003d 100644
--- a/libraries/libldap/sort.c
+++ b/libraries/libldap/sort.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
diff --git a/libraries/libldap/sortctrl.c b/libraries/libldap/sortctrl.c
index 537dac5..a061403 100644
--- a/libraries/libldap/sortctrl.c
+++ b/libraries/libldap/sortctrl.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/stctrl.c b/libraries/libldap/stctrl.c
index 0299f83..f8121e2 100644
--- a/libraries/libldap/stctrl.c
+++ b/libraries/libldap/stctrl.c
@@ -1,7 +1,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.
* Portions Copyright 2007 Pierangelo Masarati.
* All rights reserved.
*
diff --git a/libraries/libldap/string.c b/libraries/libldap/string.c
index 92f37d3..14122c9 100644
--- a/libraries/libldap/string.c
+++ b/libraries/libldap/string.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/t61.c b/libraries/libldap/t61.c
index 6aa609a..9af5488 100644
--- a/libraries/libldap/t61.c
+++ b/libraries/libldap/t61.c
@@ -1,7 +1,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2002-2022 The OpenLDAP Foundation.
+ * Copyright 2002-2024 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/libraries/libldap/tavl.c b/libraries/libldap/tavl.c
index 18a6e37..d5799b5 100644
--- a/libraries/libldap/tavl.c
+++ b/libraries/libldap/tavl.c
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2005-2022 The OpenLDAP Foundation.
+ * Copyright 2005-2024 The OpenLDAP Foundation.
* Portions Copyright (c) 2005 by Howard Chu, Symas Corp.
* All rights reserved.
*
diff --git a/libraries/libldap/test.c b/libraries/libldap/test.c
index ffe7616..cd14b06 100644
--- a/libraries/libldap/test.c
+++ b/libraries/libldap/test.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/testavl.c b/libraries/libldap/testavl.c
index c21584d..eb7c9ae 100644
--- a/libraries/libldap/testavl.c
+++ b/libraries/libldap/testavl.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
diff --git a/libraries/libldap/testtavl.c b/libraries/libldap/testtavl.c
index 0956642..6d3fc79 100644
--- a/libraries/libldap/testtavl.c
+++ b/libraries/libldap/testtavl.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
diff --git a/libraries/libldap/thr_debug.c b/libraries/libldap/thr_debug.c
index 9e028b3..df233f3 100644
--- a/libraries/libldap/thr_debug.c
+++ b/libraries/libldap/thr_debug.c
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2005-2022 The OpenLDAP Foundation.
+ * Copyright 2005-2024 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/libraries/libldap/thr_nt.c b/libraries/libldap/thr_nt.c
index 0bb1dea..931e7a6 100644
--- a/libraries/libldap/thr_nt.c
+++ b/libraries/libldap/thr_nt.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
diff --git a/libraries/libldap/thr_posix.c b/libraries/libldap/thr_posix.c
index 004dc0b..3cd3bc2 100644
--- a/libraries/libldap/thr_posix.c
+++ b/libraries/libldap/thr_posix.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
diff --git a/libraries/libldap/thr_pth.c b/libraries/libldap/thr_pth.c
index 894082d..0033f91 100644
--- a/libraries/libldap/thr_pth.c
+++ b/libraries/libldap/thr_pth.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
diff --git a/libraries/libldap/thr_thr.c b/libraries/libldap/thr_thr.c
index 86656da..65a731f 100644
--- a/libraries/libldap/thr_thr.c
+++ b/libraries/libldap/thr_thr.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
diff --git a/libraries/libldap/threads.c b/libraries/libldap/threads.c
index eb5b96e..37d6ae1 100644
--- a/libraries/libldap/threads.c
+++ b/libraries/libldap/threads.c
@@ -1,7 +1,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
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();
}
/*
diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c
index 2193232..7c23875 100644
--- a/libraries/libldap/tls_g.c
+++ b/libraries/libldap/tls_g.c
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2008-2022 The OpenLDAP Foundation.
+ * Copyright 2008-2024 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
index 6847ef3..2e08063 100644
--- a/libraries/libldap/tls_o.c
+++ b/libraries/libldap/tls_o.c
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2008-2022 The OpenLDAP Foundation.
+ * Copyright 2008-2024 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,8 +54,10 @@
#if OPENSSL_VERSION_MAJOR >= 3
#define ERR_get_error_line( a, b ) ERR_get_error_all( a, b, NULL, NULL, NULL )
+#ifndef SSL_get_peer_certificate
#define SSL_get_peer_certificate( s ) SSL_get1_peer_certificate( s )
#endif
+#endif
typedef SSL_CTX tlso_ctx;
typedef SSL tlso_session;
@@ -225,7 +227,12 @@ tlso_init( void )
SSL_library_init();
OpenSSL_add_all_digests();
#else
- OPENSSL_init_ssl(0, NULL);
+#ifdef OPENSSL_INIT_NO_ATEXIT
+#define OPENSSL_FLAGS OPENSSL_INIT_NO_ATEXIT
+#else
+#define OPENSSL_FLAGS 0
+#endif
+ OPENSSL_init_ssl(OPENSSL_FLAGS, NULL);
#endif
/* FIXME: mod_ssl does this */
@@ -1063,7 +1070,12 @@ tlso_session_endpoint( tls_session *sess, struct berval *buf, int is_server )
return 0;
#if OPENSSL_VERSION_NUMBER >= 0x10100000
- md = EVP_get_digestbynid( X509_get_signature_nid( cert ));
+ {
+ int mdnid;
+ if ( !OBJ_find_sigid_algs( X509_get_signature_nid( cert ), &mdnid, NULL ))
+ return 0;
+ md = EVP_get_digestbynid( mdnid );
+ }
#else
md = EVP_get_digestbynid(OBJ_obj2nid( cert->sig_alg->algorithm ));
#endif
diff --git a/libraries/libldap/tpool.c b/libraries/libldap/tpool.c
index f3b0da8..521dcad 100644
--- a/libraries/libldap/tpool.c
+++ b/libraries/libldap/tpool.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/turn.c b/libraries/libldap/turn.c
index 7725f01..6fc934c 100644
--- a/libraries/libldap/turn.c
+++ b/libraries/libldap/turn.c
@@ -1,7 +1,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2005-2022 The OpenLDAP Foundation.
+ * Copyright 2005-2024 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/libraries/libldap/txn.c b/libraries/libldap/txn.c
index 6409002..e509dbe 100644
--- a/libraries/libldap/txn.c
+++ b/libraries/libldap/txn.c
@@ -1,7 +1,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2006-2022 The OpenLDAP Foundation.
+ * Copyright 2006-2024 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index 820d48f..f98da1f 100644
--- a/libraries/libldap/unbind.c
+++ b/libraries/libldap/unbind.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/url.c b/libraries/libldap/url.c
index a56af30..4ce2b3f 100644
--- a/libraries/libldap/url.c
+++ b/libraries/libldap/url.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
diff --git a/libraries/libldap/urltest.c b/libraries/libldap/urltest.c
index 8c86759..70de11c 100644
--- a/libraries/libldap/urltest.c
+++ b/libraries/libldap/urltest.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
diff --git a/libraries/libldap/utf-8-conv.c b/libraries/libldap/utf-8-conv.c
index 9d8f9c1..98ed58d 100644
--- a/libraries/libldap/utf-8-conv.c
+++ b/libraries/libldap/utf-8-conv.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/utf-8.c b/libraries/libldap/utf-8.c
index c383e41..664c179 100644
--- a/libraries/libldap/utf-8.c
+++ b/libraries/libldap/utf-8.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
diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index 7cab9ea..95bfba9 100644
--- a/libraries/libldap/util-int.c
+++ b/libraries/libldap/util-int.c
@@ -1,7 +1,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.
* Portions Copyright 1998 A. Hartgers.
* All rights reserved.
*
diff --git a/libraries/libldap/vc.c b/libraries/libldap/vc.c
index 0fc29a8..d639adf 100644
--- a/libraries/libldap/vc.c
+++ b/libraries/libldap/vc.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/vlvctrl.c b/libraries/libldap/vlvctrl.c
index db009df..cce799d 100644
--- a/libraries/libldap/vlvctrl.c
+++ b/libraries/libldap/vlvctrl.c
@@ -1,7 +1,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
diff --git a/libraries/libldap/whoami.c b/libraries/libldap/whoami.c
index f3ebdeb..6c740ce 100644
--- a/libraries/libldap/whoami.c
+++ b/libraries/libldap/whoami.c
@@ -1,7 +1,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