diff options
| author | robot-contrib <[email protected]> | 2024-06-05 07:37:19 +0300 |
|---|---|---|
| committer | robot-contrib <[email protected]> | 2024-06-05 07:44:35 +0300 |
| commit | 5228455b713d183c6a50e36a117a9176224dcb44 (patch) | |
| tree | 478e8d22214d59f8e05635d50741ebb9cc454650 | |
| parent | 18e6e1ed077f6c8502bb6951a1038be3ab063ecf (diff) | |
Update contrib/libs/openldap to 2.6.8
d2f0cef9da3dea95d992cfd2e5cc4ad96dd8832b
143 files changed, 231 insertions, 173 deletions
diff --git a/contrib/libs/openldap/CHANGES b/contrib/libs/openldap/CHANGES index 0f58ed35500..019c055c048 100644 --- a/contrib/libs/openldap/CHANGES +++ b/contrib/libs/openldap/CHANGES @@ -1,5 +1,41 @@ OpenLDAP 2.6 Change Log +OpenLDAP 2.6.8 Release (2024/05/21) + Fixed libldap exit handling with OpenSSL3 again (ITS#9952) + Fixed libldap OpenSSL channel binding digest (ITS#10216) + Fixed slapd handling of large uid/gids peercred auth (ITS#10211) + Fixed slapd-asyncmeta/meta target structure allocations (ITS#10197) + Fixed slapd-meta with dynlist (ITS#10164) + Fixed slapd-meta binds when proxying internal op (ITS#10165) + Added slapo-nestgroup overlay (ITS#10161) + Added slapo-memberof 'addcheck' option (ITS#10167) + Fixed slapo-accesslog startup initialization (ITS#10170) + Fixed slapo-constraint double free on invalid attr (ITS#10204) + Fixed slapo-dynlist with abandoned operations (ITS#10044) + Build + Fixed build with gcc14.x (ITS#10166) + Fixed back-perl with clang15 (ITS#10177) + Fixed to reduce systemd dependencies (ITS#10214) + Contrib + Added slapo-alias contrib module (ITS#10104, ITS#10182) + Fixed slapo-autogroup to work with slapo-dynlist (ITS#10185) + Fixed smbk5pwd implicit function declaration (ITS#10206) + Documentation + Fixed slapo-memberof exattr requirements (ITS#7400) + Fixed slapo-memberof is no longer deprecated (ITS#7400) + Minor Cleanup + ITS#9921 + ITS#10103 + ITS#10171 + ITS#10172 + ITS#10173 + ITS#10179 + ITS#10183 + ITS#10186 + ITS#10188 + ITS#10193 + ITS#10209 + OpenLDAP 2.6.7 Release (2024/01/29) Added slapo-dynlist option to disable filter support (ITS#10025) Fixed liblber missing newline on long msg (ITS#10105) @@ -152,6 +188,7 @@ OpenLDAP 2.6.3 Release (2022/07/14) Fixed slapo-unique to not release NULL entry (ITS#8245) Build Environment Added slapd-watcher -c contextDN option (ITS#9865) + Fixed tests to use SCRAM-SHA-256 instead of DIGEST-MD5 (ITS#10208) Fixed librewrite declaration of calloc (ITS#9841) Fixed parallel builds (ITS#9840) Fixed test020 to skip back-wt (ITS#9859) diff --git a/contrib/libs/openldap/COPYRIGHT b/contrib/libs/openldap/COPYRIGHT index eecd9c68806..7fe18108efa 100644 --- a/contrib/libs/openldap/COPYRIGHT +++ b/contrib/libs/openldap/COPYRIGHT @@ -1,4 +1,4 @@ -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/contrib/libs/openldap/INSTALL b/contrib/libs/openldap/INSTALL index 9db92003715..989235d720e 100644 --- a/contrib/libs/openldap/INSTALL +++ b/contrib/libs/openldap/INSTALL @@ -95,7 +95,7 @@ configuration directory (normally /usr/local/etc/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/contrib/libs/openldap/README b/contrib/libs/openldap/README index 821815e4e8f..6a7e132e808 100644 --- a/contrib/libs/openldap/README +++ b/contrib/libs/openldap/README @@ -78,7 +78,7 @@ CONTRIBUTING 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/contrib/libs/openldap/include/ac/assert.h b/contrib/libs/openldap/include/ac/assert.h index dbb22951c35..94719798bf8 100644 --- a/contrib/libs/openldap/include/ac/assert.h +++ b/contrib/libs/openldap/include/ac/assert.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/contrib/libs/openldap/include/ac/bytes.h b/contrib/libs/openldap/include/ac/bytes.h index f8a6314eb2a..f55bfb2b940 100644 --- a/contrib/libs/openldap/include/ac/bytes.h +++ b/contrib/libs/openldap/include/ac/bytes.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/contrib/libs/openldap/include/ac/ctype.h b/contrib/libs/openldap/include/ac/ctype.h index e385f3acbc6..7bb32dc2713 100644 --- a/contrib/libs/openldap/include/ac/ctype.h +++ b/contrib/libs/openldap/include/ac/ctype.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/contrib/libs/openldap/include/ac/dirent.h b/contrib/libs/openldap/include/ac/dirent.h index 93df7b6f2ae..f4ebbf8ecc7 100644 --- a/contrib/libs/openldap/include/ac/dirent.h +++ b/contrib/libs/openldap/include/ac/dirent.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/contrib/libs/openldap/include/ac/errno.h b/contrib/libs/openldap/include/ac/errno.h index 8a7f32c909d..9ecd4600c86 100644 --- a/contrib/libs/openldap/include/ac/errno.h +++ b/contrib/libs/openldap/include/ac/errno.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/contrib/libs/openldap/include/ac/fdset.h b/contrib/libs/openldap/include/ac/fdset.h index 620850b1fc7..2ea6eb55c23 100644 --- a/contrib/libs/openldap/include/ac/fdset.h +++ b/contrib/libs/openldap/include/ac/fdset.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/contrib/libs/openldap/include/ac/localize.h b/contrib/libs/openldap/include/ac/localize.h index 9e19fe6e96b..06ba6f56d3b 100644 --- a/contrib/libs/openldap/include/ac/localize.h +++ b/contrib/libs/openldap/include/ac/localize.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/contrib/libs/openldap/include/ac/param.h b/contrib/libs/openldap/include/ac/param.h index a3f5d675e01..1f6d56c909a 100644 --- a/contrib/libs/openldap/include/ac/param.h +++ b/contrib/libs/openldap/include/ac/param.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/contrib/libs/openldap/include/ac/signal.h b/contrib/libs/openldap/include/ac/signal.h index 1c7293bba21..12dd6d3b9dd 100644 --- a/contrib/libs/openldap/include/ac/signal.h +++ b/contrib/libs/openldap/include/ac/signal.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/contrib/libs/openldap/include/ac/socket.h b/contrib/libs/openldap/include/ac/socket.h index ce46c6f8b78..589b251fea3 100644 --- a/contrib/libs/openldap/include/ac/socket.h +++ b/contrib/libs/openldap/include/ac/socket.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/contrib/libs/openldap/include/ac/stdarg.h b/contrib/libs/openldap/include/ac/stdarg.h index 7ba29737e33..6c075d924e4 100644 --- a/contrib/libs/openldap/include/ac/stdarg.h +++ b/contrib/libs/openldap/include/ac/stdarg.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/contrib/libs/openldap/include/ac/stdlib.h b/contrib/libs/openldap/include/ac/stdlib.h index d9a95136acf..4980978e12e 100644 --- a/contrib/libs/openldap/include/ac/stdlib.h +++ b/contrib/libs/openldap/include/ac/stdlib.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/contrib/libs/openldap/include/ac/string.h b/contrib/libs/openldap/include/ac/string.h index 20a68d76bcb..f82a98bb4f1 100644 --- a/contrib/libs/openldap/include/ac/string.h +++ b/contrib/libs/openldap/include/ac/string.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/contrib/libs/openldap/include/ac/syslog.h b/contrib/libs/openldap/include/ac/syslog.h index 90028ae704d..28696e40a85 100644 --- a/contrib/libs/openldap/include/ac/syslog.h +++ b/contrib/libs/openldap/include/ac/syslog.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/contrib/libs/openldap/include/ac/time.h b/contrib/libs/openldap/include/ac/time.h index b715db04e84..cd75a6f05c9 100644 --- a/contrib/libs/openldap/include/ac/time.h +++ b/contrib/libs/openldap/include/ac/time.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/contrib/libs/openldap/include/ac/unistd.h b/contrib/libs/openldap/include/ac/unistd.h index 64e8a8301b8..ea26fd368cf 100644 --- a/contrib/libs/openldap/include/ac/unistd.h +++ b/contrib/libs/openldap/include/ac/unistd.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/contrib/libs/openldap/include/lber.h b/contrib/libs/openldap/include/lber.h index d474eb06352..530359dc92f 100644 --- a/contrib/libs/openldap/include/lber.h +++ b/contrib/libs/openldap/include/lber.h @@ -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/contrib/libs/openldap/include/lber_pvt.h b/contrib/libs/openldap/include/lber_pvt.h index 474c291e266..85c68355b68 100644 --- a/contrib/libs/openldap/include/lber_pvt.h +++ b/contrib/libs/openldap/include/lber_pvt.h @@ -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/contrib/libs/openldap/include/lber_types.h b/contrib/libs/openldap/include/lber_types.h index c32b803a89a..823ae851949 100644 --- a/contrib/libs/openldap/include/lber_types.h +++ b/contrib/libs/openldap/include/lber_types.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/contrib/libs/openldap/include/ldap.h b/contrib/libs/openldap/include/ldap.h index f0cce01f430..a482b2bf55a 100644 --- a/contrib/libs/openldap/include/ldap.h +++ b/contrib/libs/openldap/include/ldap.h @@ -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/contrib/libs/openldap/include/ldap_avl.h b/contrib/libs/openldap/include/ldap_avl.h index 4bb1c397801..735c411194a 100644 --- a/contrib/libs/openldap/include/ldap_avl.h +++ b/contrib/libs/openldap/include/ldap_avl.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/contrib/libs/openldap/include/ldap_cdefs.h b/contrib/libs/openldap/include/ldap_cdefs.h index 2f5fa7f7e9e..b602acf139f 100644 --- a/contrib/libs/openldap/include/ldap_cdefs.h +++ b/contrib/libs/openldap/include/ldap_cdefs.h @@ -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/contrib/libs/openldap/include/ldap_config.h b/contrib/libs/openldap/include/ldap_config.h index 160eb63bccc..2b031824e6f 100644 --- a/contrib/libs/openldap/include/ldap_config.h +++ b/contrib/libs/openldap/include/ldap_config.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 @@ -52,10 +52,10 @@ #define LDAP_SBINDIR "/var/empty/tmp/out/sbin" #endif #ifndef LDAP_DATADIR -#define LDAP_DATADIR "/var/empty/openldap-2.6.7/share/openldap" +#define LDAP_DATADIR "/var/empty/openldap-2.6.8/share/openldap" #endif #ifndef LDAP_SYSCONFDIR -#define LDAP_SYSCONFDIR "/var/empty/openldap-2.6.7/etc/openldap" +#define LDAP_SYSCONFDIR "/var/empty/openldap-2.6.8/etc/openldap" #endif #ifndef LDAP_LIBEXECDIR #define LDAP_LIBEXECDIR "/var/empty/tmp/out/libexec" @@ -64,7 +64,7 @@ #define LDAP_MODULEDIR "/var/empty/tmp/out/libexec/openldap" #endif #ifndef LDAP_RUNDIR -#define LDAP_RUNDIR "/var/empty/openldap-2.6.7/var" +#define LDAP_RUNDIR "/var/empty/openldap-2.6.8/var" #endif #ifndef LDAP_LOCALEDIR #define LDAP_LOCALEDIR "" diff --git a/contrib/libs/openldap/include/ldap_defaults.h b/contrib/libs/openldap/include/ldap_defaults.h index c8632d7dcec..06ad84f1b9a 100644 --- a/contrib/libs/openldap/include/ldap_defaults.h +++ b/contrib/libs/openldap/include/ldap_defaults.h @@ -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/contrib/libs/openldap/include/ldap_features.h b/contrib/libs/openldap/include/ldap_features.h index 009eef31fe5..bcd78f34d97 100644 --- a/contrib/libs/openldap/include/ldap_features.h +++ b/contrib/libs/openldap/include/ldap_features.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 @@ -22,10 +22,10 @@ #define _LDAP_FEATURES_H 1 /* OpenLDAP API version macros */ -#define LDAP_VENDOR_VERSION 20607 +#define LDAP_VENDOR_VERSION 20608 #define LDAP_VENDOR_VERSION_MAJOR 2 #define LDAP_VENDOR_VERSION_MINOR 6 -#define LDAP_VENDOR_VERSION_PATCH 7 +#define LDAP_VENDOR_VERSION_PATCH 8 /* ** WORK IN PROGRESS! diff --git a/contrib/libs/openldap/include/ldap_int_thread.h b/contrib/libs/openldap/include/ldap_int_thread.h index cd2e636b5b7..0bf2a30b1d6 100644 --- a/contrib/libs/openldap/include/ldap_int_thread.h +++ b/contrib/libs/openldap/include/ldap_int_thread.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/contrib/libs/openldap/include/ldap_log.h b/contrib/libs/openldap/include/ldap_log.h index 8b8b0b654e0..4e7db34dbb3 100644 --- a/contrib/libs/openldap/include/ldap_log.h +++ b/contrib/libs/openldap/include/ldap_log.h @@ -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/contrib/libs/openldap/include/ldap_pvt.h b/contrib/libs/openldap/include/ldap_pvt.h index 7d840dafd4a..6654d0e46a4 100644 --- a/contrib/libs/openldap/include/ldap_pvt.h +++ b/contrib/libs/openldap/include/ldap_pvt.h @@ -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/contrib/libs/openldap/include/ldap_pvt_thread.h b/contrib/libs/openldap/include/ldap_pvt_thread.h index 829ce8a1a88..ec4a6612b1e 100644 --- a/contrib/libs/openldap/include/ldap_pvt_thread.h +++ b/contrib/libs/openldap/include/ldap_pvt_thread.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/contrib/libs/openldap/include/ldap_pvt_uc.h b/contrib/libs/openldap/include/ldap_pvt_uc.h index 1f2a50de1a8..19f6819035d 100644 --- a/contrib/libs/openldap/include/ldap_pvt_uc.h +++ b/contrib/libs/openldap/include/ldap_pvt_uc.h @@ -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/contrib/libs/openldap/include/ldap_queue.h b/contrib/libs/openldap/include/ldap_queue.h index 6d32370107e..060fad17451 100644 --- a/contrib/libs/openldap/include/ldap_queue.h +++ b/contrib/libs/openldap/include/ldap_queue.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software <http://www.openldap.org/>. * - * Copyright 2001-2022 The OpenLDAP Foundation. + * Copyright 2001-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/contrib/libs/openldap/include/ldap_rq.h b/contrib/libs/openldap/include/ldap_rq.h index 1050550ba85..fb9a95be99a 100644 --- a/contrib/libs/openldap/include/ldap_rq.h +++ b/contrib/libs/openldap/include/ldap_rq.h @@ -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/contrib/libs/openldap/include/ldap_schema.h b/contrib/libs/openldap/include/ldap_schema.h index 96321800252..2ea5b407108 100644 --- a/contrib/libs/openldap/include/ldap_schema.h +++ b/contrib/libs/openldap/include/ldap_schema.h @@ -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/contrib/libs/openldap/include/ldap_utf8.h b/contrib/libs/openldap/include/ldap_utf8.h index 663043a594f..f2bd10eb02a 100644 --- a/contrib/libs/openldap/include/ldap_utf8.h +++ b/contrib/libs/openldap/include/ldap_utf8.h @@ -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/contrib/libs/openldap/include/ldif.h b/contrib/libs/openldap/include/ldif.h index 62cacdc8ee7..6c05cc45129 100644 --- a/contrib/libs/openldap/include/ldif.h +++ b/contrib/libs/openldap/include/ldif.h @@ -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/contrib/libs/openldap/include/lutil.h b/contrib/libs/openldap/include/lutil.h index fe0e6deab60..b037caa1bf0 100644 --- a/contrib/libs/openldap/include/lutil.h +++ b/contrib/libs/openldap/include/lutil.h @@ -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/contrib/libs/openldap/include/lutil_lockf.h b/contrib/libs/openldap/include/lutil_lockf.h index b24bde881d8..25cb231dfa9 100644 --- a/contrib/libs/openldap/include/lutil_lockf.h +++ b/contrib/libs/openldap/include/lutil_lockf.h @@ -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/contrib/libs/openldap/include/openldap.h b/contrib/libs/openldap/include/openldap.h index 70a39c69daf..4b65750bf70 100644 --- a/contrib/libs/openldap/include/openldap.h +++ b/contrib/libs/openldap/include/openldap.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software <http://www.openldap.org/>. * - * Copyright 2019-2022 The OpenLDAP Foundation. + * Copyright 2019-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/contrib/libs/openldap/include/portable-linux.h b/contrib/libs/openldap/include/portable-linux.h index a28fd48d6d3..c42a93a0d7d 100644 --- a/contrib/libs/openldap/include/portable-linux.h +++ b/contrib/libs/openldap/include/portable-linux.h @@ -5,7 +5,7 @@ /* begin of portable.h.pre */ /* 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 @@ -550,6 +550,9 @@ /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 +/* Define to 1 if you have the <stdio.h> header file. */ +#define HAVE_STDIO_H 1 + /* Define to 1 if you have the <stdlib.h> header file. */ #define HAVE_STDLIB_H 1 @@ -847,7 +850,7 @@ #define LDAP_SYSLOG 1 /* Version */ -#define LDAP_VENDOR_VERSION 20607 +#define LDAP_VENDOR_VERSION 20608 /* Major */ #define LDAP_VENDOR_VERSION_MAJOR 2 @@ -856,7 +859,7 @@ #define LDAP_VENDOR_VERSION_MINOR 6 /* Patch */ -#define LDAP_VENDOR_VERSION_PATCH 7 +#define LDAP_VENDOR_VERSION_PATCH 8 /* Define to the sub-directory where libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/" @@ -874,7 +877,7 @@ #define OPENLDAP_PACKAGE "OpenLDAP" /* Version */ -#define OPENLDAP_VERSION "2.6.7" +#define OPENLDAP_VERSION "2.6.8" /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "" @@ -990,6 +993,9 @@ /* define for Reverse Group Membership overlay */ #define SLAPD_OVER_MEMBEROF SLAPD_MOD_STATIC +/* define for Nested Group overlay */ +#define SLAPD_OVER_NESTGROUP SLAPD_MOD_STATIC + /* define for OTP 2-factor Authentication overlay */ #define SLAPD_OVER_OTP SLAPD_MOD_STATIC @@ -1059,7 +1065,9 @@ /* define to support run-time loadable ACL */ /* #undef SLAP_DYNACL */ -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #define STDC_HEADERS 1 /* Define to 1 if your <sys/time.h> declares `struct tm'. */ diff --git a/contrib/libs/openldap/libraries/liblber/assert.c b/contrib/libs/openldap/libraries/liblber/assert.c index bcaa9af8c51..1c952cc599c 100644 --- a/contrib/libs/openldap/libraries/liblber/assert.c +++ b/contrib/libs/openldap/libraries/liblber/assert.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/contrib/libs/openldap/libraries/liblber/bprint.c b/contrib/libs/openldap/libraries/liblber/bprint.c index 4b179b107ea..1f83a78949b 100644 --- a/contrib/libs/openldap/libraries/liblber/bprint.c +++ b/contrib/libs/openldap/libraries/liblber/bprint.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/contrib/libs/openldap/libraries/liblber/debug.c b/contrib/libs/openldap/libraries/liblber/debug.c index 1f4fdbb61ab..129de1dc293 100644 --- a/contrib/libs/openldap/libraries/liblber/debug.c +++ b/contrib/libs/openldap/libraries/liblber/debug.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/contrib/libs/openldap/libraries/liblber/decode.c b/contrib/libs/openldap/libraries/liblber/decode.c index 48696e05101..1bc897d9b91 100644 --- a/contrib/libs/openldap/libraries/liblber/decode.c +++ b/contrib/libs/openldap/libraries/liblber/decode.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/contrib/libs/openldap/libraries/liblber/encode.c b/contrib/libs/openldap/libraries/liblber/encode.c index 30d28eb6038..055d76c8d17 100644 --- a/contrib/libs/openldap/libraries/liblber/encode.c +++ b/contrib/libs/openldap/libraries/liblber/encode.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/contrib/libs/openldap/libraries/liblber/io.c b/contrib/libs/openldap/libraries/liblber/io.c index ea5aaa6357a..d41b075ff04 100644 --- a/contrib/libs/openldap/libraries/liblber/io.c +++ b/contrib/libs/openldap/libraries/liblber/io.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/contrib/libs/openldap/libraries/liblber/lber-int.h b/contrib/libs/openldap/libraries/liblber/lber-int.h index 14a110653cf..7eaabdedb70 100644 --- a/contrib/libs/openldap/libraries/liblber/lber-int.h +++ b/contrib/libs/openldap/libraries/liblber/lber-int.h @@ -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/contrib/libs/openldap/libraries/liblber/memory.c b/contrib/libs/openldap/libraries/liblber/memory.c index c5083387dd6..971d46d67d0 100644 --- a/contrib/libs/openldap/libraries/liblber/memory.c +++ b/contrib/libs/openldap/libraries/liblber/memory.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/contrib/libs/openldap/libraries/liblber/options.c b/contrib/libs/openldap/libraries/liblber/options.c index a31c8ecf87e..ae64f3ed76c 100644 --- a/contrib/libs/openldap/libraries/liblber/options.c +++ b/contrib/libs/openldap/libraries/liblber/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/contrib/libs/openldap/libraries/liblber/sockbuf.c b/contrib/libs/openldap/libraries/liblber/sockbuf.c index 7bd322873c7..89d037bcadc 100644 --- a/contrib/libs/openldap/libraries/liblber/sockbuf.c +++ b/contrib/libs/openldap/libraries/liblber/sockbuf.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/contrib/libs/openldap/libraries/liblber/stdio.c b/contrib/libs/openldap/libraries/liblber/stdio.c index 6550690fada..3346b6f826b 100644 --- a/contrib/libs/openldap/libraries/liblber/stdio.c +++ b/contrib/libs/openldap/libraries/liblber/stdio.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/contrib/libs/openldap/libraries/liblber/version.c b/contrib/libs/openldap/libraries/liblber/version.c index 2d24ed04e7c..a18166a1896 100644 --- a/contrib/libs/openldap/libraries/liblber/version.c +++ b/contrib/libs/openldap/libraries/liblber/version.c @@ -1,6 +1,6 @@ /* 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 @@ -13,10 +13,10 @@ */ static const char copyright[] = -"Copyright 1998-2022 The OpenLDAP Foundation. All rights reserved.\n" +"Copyright 1998-2024 The OpenLDAP Foundation. All rights reserved.\n" "COPYING RESTRICTIONS APPLY\n"; static const char __Version[] = -"@(#) $OpenLDAP: liblber.la 2.6.7 (" __DATE__ " " __TIME__ ") $\n" +"@(#) $OpenLDAP: liblber.la 2.6.8 (" __DATE__ " " __TIME__ ") $\n" "\topenldap\n"; diff --git a/contrib/libs/openldap/libraries/libldap/abandon.c b/contrib/libs/openldap/libraries/libldap/abandon.c index 6161cc9cb43..eef69364539 100644 --- a/contrib/libs/openldap/libraries/libldap/abandon.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/account_usability.c b/contrib/libs/openldap/libraries/libldap/account_usability.c index 9cac6e6416e..5ebd8c33818 100644 --- a/contrib/libs/openldap/libraries/libldap/account_usability.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/add.c b/contrib/libs/openldap/libraries/libldap/add.c index 7f63fa2b772..88ea90d7595 100644 --- a/contrib/libs/openldap/libraries/libldap/add.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/addentry.c b/contrib/libs/openldap/libraries/libldap/addentry.c index 14a8879c91a..83a0d5c7ae2 100644 --- a/contrib/libs/openldap/libraries/libldap/addentry.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/assertion.c b/contrib/libs/openldap/libraries/libldap/assertion.c index 97ddb61616a..6a83bf19c19 100644 --- a/contrib/libs/openldap/libraries/libldap/assertion.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/avl.c b/contrib/libs/openldap/libraries/libldap/avl.c index fd22c7f0de6..cd5c17fa797 100644 --- a/contrib/libs/openldap/libraries/libldap/avl.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/bind.c b/contrib/libs/openldap/libraries/libldap/bind.c index ea6fe5ca6bb..129a215bdf9 100644 --- a/contrib/libs/openldap/libraries/libldap/bind.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/cancel.c b/contrib/libs/openldap/libraries/libldap/cancel.c index cfb4ba1959c..55a4eb180cd 100644 --- a/contrib/libs/openldap/libraries/libldap/cancel.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/charray.c b/contrib/libs/openldap/libraries/libldap/charray.c index 856843fed86..a441ea2b9af 100644 --- a/contrib/libs/openldap/libraries/libldap/charray.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/compare.c b/contrib/libs/openldap/libraries/libldap/compare.c index 86285c685ac..088a294679b 100644 --- a/contrib/libs/openldap/libraries/libldap/compare.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/controls.c b/contrib/libs/openldap/libraries/libldap/controls.c index 125707e272f..e43cd2c2267 100644 --- a/contrib/libs/openldap/libraries/libldap/controls.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/cyrus.c b/contrib/libs/openldap/libraries/libldap/cyrus.c index e713e58dcce..e393365013f 100644 --- a/contrib/libs/openldap/libraries/libldap/cyrus.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/dds.c b/contrib/libs/openldap/libraries/libldap/dds.c index 7244d05f9a4..cede743ad61 100644 --- a/contrib/libs/openldap/libraries/libldap/dds.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/delete.c b/contrib/libs/openldap/libraries/libldap/delete.c index b086f97e23c..7b3ce8d93e9 100644 --- a/contrib/libs/openldap/libraries/libldap/delete.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/deref.c b/contrib/libs/openldap/libraries/libldap/deref.c index f187a9fd441..d63405b033a 100644 --- a/contrib/libs/openldap/libraries/libldap/deref.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/dnssrv.c b/contrib/libs/openldap/libraries/libldap/dnssrv.c index 433c37f5e01..1971b48dfae 100644 --- a/contrib/libs/openldap/libraries/libldap/dnssrv.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/error.c b/contrib/libs/openldap/libraries/libldap/error.c index 444a0244bf3..297553d1cc5 100644 --- a/contrib/libs/openldap/libraries/libldap/error.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/extended.c b/contrib/libs/openldap/libraries/libldap/extended.c index b492fcdfc74..7f58d7f3403 100644 --- a/contrib/libs/openldap/libraries/libldap/extended.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/fetch.c b/contrib/libs/openldap/libraries/libldap/fetch.c index 536871bcfe3..b8cd049cf65 100644 --- a/contrib/libs/openldap/libraries/libldap/fetch.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/filter.c b/contrib/libs/openldap/libraries/libldap/filter.c index e158fd1fe3a..cfe0ffb52ce 100644 --- a/contrib/libs/openldap/libraries/libldap/filter.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/free.c b/contrib/libs/openldap/libraries/libldap/free.c index 4d09eeef452..b37b2e10286 100644 --- a/contrib/libs/openldap/libraries/libldap/free.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/getattr.c b/contrib/libs/openldap/libraries/libldap/getattr.c index 07398dffb53..9f0e74e4fec 100644 --- a/contrib/libs/openldap/libraries/libldap/getattr.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/getdn.c b/contrib/libs/openldap/libraries/libldap/getdn.c index 7d8b52f1e4d..f1bce2cfc42 100644 --- a/contrib/libs/openldap/libraries/libldap/getdn.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/getentry.c b/contrib/libs/openldap/libraries/libldap/getentry.c index b812189e6e0..11f5ac00d9e 100644 --- a/contrib/libs/openldap/libraries/libldap/getentry.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/getvalues.c b/contrib/libs/openldap/libraries/libldap/getvalues.c index b3ac1907f83..61077b48097 100644 --- a/contrib/libs/openldap/libraries/libldap/getvalues.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/init.c b/contrib/libs/openldap/libraries/libldap/init.c index b9915533bd9..213276b4b58 100644 --- a/contrib/libs/openldap/libraries/libldap/init.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/lbase64.c b/contrib/libs/openldap/libraries/libldap/lbase64.c index aa4a622fd03..90b1b20178a 100644 --- a/contrib/libs/openldap/libraries/libldap/lbase64.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/ldap-int.h b/contrib/libs/openldap/libraries/libldap/ldap-int.h index a401f273416..3ef17643b18 100644 --- a/contrib/libs/openldap/libraries/libldap/ldap-int.h +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/ldap-tls.h b/contrib/libs/openldap/libraries/libldap/ldap-tls.h index e2d7efc9cf8..cb3721a7ffc 100644 --- a/contrib/libs/openldap/libraries/libldap/ldap-tls.h +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/ldap_sync.c b/contrib/libs/openldap/libraries/libldap/ldap_sync.c index 6c99e3a8959..ce06a35d4a1 100644 --- a/contrib/libs/openldap/libraries/libldap/ldap_sync.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/ldap_thr_debug.h b/contrib/libs/openldap/libraries/libldap/ldap_thr_debug.h index db6a052185c..b346337a9cf 100644 --- a/contrib/libs/openldap/libraries/libldap/ldap_thr_debug.h +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/ldif.c b/contrib/libs/openldap/libraries/libldap/ldif.c index 57e44f8c7e4..3141a35b20c 100644 --- a/contrib/libs/openldap/libraries/libldap/ldif.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/ldifutil.c b/contrib/libs/openldap/libraries/libldap/ldifutil.c index df557e590c1..24227eb77d9 100644 --- a/contrib/libs/openldap/libraries/libldap/ldifutil.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/messages.c b/contrib/libs/openldap/libraries/libldap/messages.c index c4bf7325a61..709215176d1 100644 --- a/contrib/libs/openldap/libraries/libldap/messages.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/modify.c b/contrib/libs/openldap/libraries/libldap/modify.c index cb8d85a6130..02e11c8580a 100644 --- a/contrib/libs/openldap/libraries/libldap/modify.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/modrdn.c b/contrib/libs/openldap/libraries/libldap/modrdn.c index 756762e2281..e22bb120a86 100644 --- a/contrib/libs/openldap/libraries/libldap/modrdn.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/msctrl.c b/contrib/libs/openldap/libraries/libldap/msctrl.c index 0f9264e43a5..6ded7136e0b 100644 --- a/contrib/libs/openldap/libraries/libldap/msctrl.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/open.c b/contrib/libs/openldap/libraries/libldap/open.c index 93720ebc914..58457c0c0af 100644 --- a/contrib/libs/openldap/libraries/libldap/open.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/options.c b/contrib/libs/openldap/libraries/libldap/options.c index 7a096add2bb..218d5445a7f 100644 --- a/contrib/libs/openldap/libraries/libldap/options.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/os-ip.c b/contrib/libs/openldap/libraries/libldap/os-ip.c index a84735e7afe..6c86edd0558 100644 --- a/contrib/libs/openldap/libraries/libldap/os-ip.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/os-local.c b/contrib/libs/openldap/libraries/libldap/os-local.c index 8b310309573..980326e8884 100644 --- a/contrib/libs/openldap/libraries/libldap/os-local.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/pagectrl.c b/contrib/libs/openldap/libraries/libldap/pagectrl.c index c7a1499b414..1668c961ad0 100644 --- a/contrib/libs/openldap/libraries/libldap/pagectrl.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/passwd.c b/contrib/libs/openldap/libraries/libldap/passwd.c index f529de5f32c..42e15bcd504 100644 --- a/contrib/libs/openldap/libraries/libldap/passwd.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/ppolicy.c b/contrib/libs/openldap/libraries/libldap/ppolicy.c index dc932096454..faf72acf020 100644 --- a/contrib/libs/openldap/libraries/libldap/ppolicy.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/print.c b/contrib/libs/openldap/libraries/libldap/print.c index 6f8681a43c7..223750c3c91 100644 --- a/contrib/libs/openldap/libraries/libldap/print.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/psearchctrl.c b/contrib/libs/openldap/libraries/libldap/psearchctrl.c index b465873809b..2552a5a0e6f 100644 --- a/contrib/libs/openldap/libraries/libldap/psearchctrl.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/rdwr.c b/contrib/libs/openldap/libraries/libldap/rdwr.c index dde9403d83f..50d4fb9f74b 100644 --- a/contrib/libs/openldap/libraries/libldap/rdwr.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/references.c b/contrib/libs/openldap/libraries/libldap/references.c index ee04e6371b9..ca9cd01ba63 100644 --- a/contrib/libs/openldap/libraries/libldap/references.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/request.c b/contrib/libs/openldap/libraries/libldap/request.c index 850e31fc8e4..1fff2a4c736 100644 --- a/contrib/libs/openldap/libraries/libldap/request.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/result.c b/contrib/libs/openldap/libraries/libldap/result.c index 40ff1c1722d..95dba939026 100644 --- a/contrib/libs/openldap/libraries/libldap/result.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/rq.c b/contrib/libs/openldap/libraries/libldap/rq.c index 6b16409ded4..a5a72e04a12 100644 --- a/contrib/libs/openldap/libraries/libldap/rq.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/sasl.c b/contrib/libs/openldap/libraries/libldap/sasl.c index fa5fc132829..8c027b8995a 100644 --- a/contrib/libs/openldap/libraries/libldap/sasl.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/sbind.c b/contrib/libs/openldap/libraries/libldap/sbind.c index 420ac6a3d82..eaec9e414b0 100644 --- a/contrib/libs/openldap/libraries/libldap/sbind.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/schema.c b/contrib/libs/openldap/libraries/libldap/schema.c index a4b89fa9fef..6df86615e49 100644 --- a/contrib/libs/openldap/libraries/libldap/schema.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/search.c b/contrib/libs/openldap/libraries/libldap/search.c index 23815777ade..cbf2e62b205 100644 --- a/contrib/libs/openldap/libraries/libldap/search.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/sort.c b/contrib/libs/openldap/libraries/libldap/sort.c index 6159be8a60e..810003d18dc 100644 --- a/contrib/libs/openldap/libraries/libldap/sort.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/sortctrl.c b/contrib/libs/openldap/libraries/libldap/sortctrl.c index 537dac58695..a0614030707 100644 --- a/contrib/libs/openldap/libraries/libldap/sortctrl.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/stctrl.c b/contrib/libs/openldap/libraries/libldap/stctrl.c index 0299f83d6e6..f8121e2848e 100644 --- a/contrib/libs/openldap/libraries/libldap/stctrl.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/string.c b/contrib/libs/openldap/libraries/libldap/string.c index 92f37d3ffbf..14122c92ed6 100644 --- a/contrib/libs/openldap/libraries/libldap/string.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/tavl.c b/contrib/libs/openldap/libraries/libldap/tavl.c index 18a6e3768fb..d5799b5ea20 100644 --- a/contrib/libs/openldap/libraries/libldap/tavl.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/thr_debug.c b/contrib/libs/openldap/libraries/libldap/thr_debug.c index 9e028b32731..df233f3fccb 100644 --- a/contrib/libs/openldap/libraries/libldap/thr_debug.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/thr_nt.c b/contrib/libs/openldap/libraries/libldap/thr_nt.c index 0bb1deaafaf..931e7a6c50f 100644 --- a/contrib/libs/openldap/libraries/libldap/thr_nt.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/thr_posix.c b/contrib/libs/openldap/libraries/libldap/thr_posix.c index 004dc0bb18b..3cd3bc2c379 100644 --- a/contrib/libs/openldap/libraries/libldap/thr_posix.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/thr_pth.c b/contrib/libs/openldap/libraries/libldap/thr_pth.c index 894082d854d..0033f91e57e 100644 --- a/contrib/libs/openldap/libraries/libldap/thr_pth.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/thr_thr.c b/contrib/libs/openldap/libraries/libldap/thr_thr.c index 86656da6f08..65a731faaa3 100644 --- a/contrib/libs/openldap/libraries/libldap/thr_thr.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/threads.c b/contrib/libs/openldap/libraries/libldap/threads.c index eb5b96ea98b..37d6ae18cdb 100644 --- a/contrib/libs/openldap/libraries/libldap/threads.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/tls2.c b/contrib/libs/openldap/libraries/libldap/tls2.c index 4bfc346c70b..dea46de0adf 100644 --- a/contrib/libs/openldap/libraries/libldap/tls2.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/tls_g.c b/contrib/libs/openldap/libraries/libldap/tls_g.c index b258a586d75..f4db40eef2c 100644 --- a/contrib/libs/openldap/libraries/libldap/tls_g.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/tls_o.c b/contrib/libs/openldap/libraries/libldap/tls_o.c index 6847ef33b46..2e0806315a4 100644 --- a/contrib/libs/openldap/libraries/libldap/tls_o.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/tpool.c b/contrib/libs/openldap/libraries/libldap/tpool.c index f3b0da8ca2c..521dcaded9a 100644 --- a/contrib/libs/openldap/libraries/libldap/tpool.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/turn.c b/contrib/libs/openldap/libraries/libldap/turn.c index 7725f01d0d2..6fc934c244b 100644 --- a/contrib/libs/openldap/libraries/libldap/turn.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/txn.c b/contrib/libs/openldap/libraries/libldap/txn.c index 64090023449..e509dbe2740 100644 --- a/contrib/libs/openldap/libraries/libldap/txn.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/unbind.c b/contrib/libs/openldap/libraries/libldap/unbind.c index 820d48feae8..f98da1f57b1 100644 --- a/contrib/libs/openldap/libraries/libldap/unbind.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/url.c b/contrib/libs/openldap/libraries/libldap/url.c index a56af3093c5..4ce2b3f4d86 100644 --- a/contrib/libs/openldap/libraries/libldap/url.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/utf-8-conv.c b/contrib/libs/openldap/libraries/libldap/utf-8-conv.c index 9d8f9c18bb0..98ed58de308 100644 --- a/contrib/libs/openldap/libraries/libldap/utf-8-conv.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/utf-8.c b/contrib/libs/openldap/libraries/libldap/utf-8.c index c383e414134..664c179a802 100644 --- a/contrib/libs/openldap/libraries/libldap/utf-8.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/util-int.c b/contrib/libs/openldap/libraries/libldap/util-int.c index 7cab9ea3e56..95bfba96b53 100644 --- a/contrib/libs/openldap/libraries/libldap/util-int.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/vc.c b/contrib/libs/openldap/libraries/libldap/vc.c index 0fc29a8c9a8..d639adfa2c9 100644 --- a/contrib/libs/openldap/libraries/libldap/vc.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/version.c b/contrib/libs/openldap/libraries/libldap/version.c index 4346e795466..7b1fb006b97 100644 --- a/contrib/libs/openldap/libraries/libldap/version.c +++ b/contrib/libs/openldap/libraries/libldap/version.c @@ -1,6 +1,6 @@ /* 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 @@ -13,10 +13,10 @@ */ static const char copyright[] = -"Copyright 1998-2022 The OpenLDAP Foundation. All rights reserved.\n" +"Copyright 1998-2024 The OpenLDAP Foundation. All rights reserved.\n" "COPYING RESTRICTIONS APPLY\n"; static const char __Version[] = -"@(#) $OpenLDAP: libldap.la 2.6.7 (" __DATE__ " " __TIME__ ") $\n" +"@(#) $OpenLDAP: libldap.la 2.6.8 (" __DATE__ " " __TIME__ ") $\n" "\topenldap\n"; diff --git a/contrib/libs/openldap/libraries/libldap/vlvctrl.c b/contrib/libs/openldap/libraries/libldap/vlvctrl.c index db009df42f8..cce799d5686 100644 --- a/contrib/libs/openldap/libraries/libldap/vlvctrl.c +++ b/contrib/libs/openldap/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/contrib/libs/openldap/libraries/libldap/whoami.c b/contrib/libs/openldap/libraries/libldap/whoami.c index f3ebdeb1189..6c740cea335 100644 --- a/contrib/libs/openldap/libraries/libldap/whoami.c +++ b/contrib/libs/openldap/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 diff --git a/contrib/libs/openldap/libraries/liblmdb/CHANGES b/contrib/libs/openldap/libraries/liblmdb/CHANGES index 10e81d5bd35..20babf3db5f 100644 --- a/contrib/libs/openldap/libraries/liblmdb/CHANGES +++ b/contrib/libs/openldap/libraries/liblmdb/CHANGES @@ -1,5 +1,10 @@ LMDB 0.9 Change Log +LMDB 0.9.33 Release (2024/05/21) + ITS#9037 mdb_page_search: fix error code when DBI record is missing + ITS#10198 For win32, stop passing ignored parameter + ITS#10212 Fix meta page usage by read only tools + LMDB 0.9.32 Release (2024/01/29) ITS#9378 - Add ability to replay log and replay log tool ITS#10095 - partial revert of ITS#9278. The patch was incorrect and introduced numerous race conditions. diff --git a/contrib/libs/openldap/libraries/liblmdb/lmdb.h b/contrib/libs/openldap/libraries/liblmdb/lmdb.h index d638a678a8b..199382a14c1 100644 --- a/contrib/libs/openldap/libraries/liblmdb/lmdb.h +++ b/contrib/libs/openldap/libraries/liblmdb/lmdb.h @@ -200,7 +200,7 @@ typedef int mdb_filehandle_t; /** Library minor version */ #define MDB_VERSION_MINOR 9 /** Library patch version */ -#define MDB_VERSION_PATCH 32 +#define MDB_VERSION_PATCH 33 /** Combine args a,b,c into a single integer for easy version comparisons */ #define MDB_VERINT(a,b,c) (((a) << 24) | ((b) << 16) | (c)) @@ -210,7 +210,7 @@ typedef int mdb_filehandle_t; MDB_VERINT(MDB_VERSION_MAJOR,MDB_VERSION_MINOR,MDB_VERSION_PATCH) /** The release date of this library version */ -#define MDB_VERSION_DATE "January 29, 2024" +#define MDB_VERSION_DATE "May 21, 2024" /** A stringifier for the version info */ #define MDB_VERSTR(a,b,c,d) "LMDB " #a "." #b "." #c ": (" d ")" diff --git a/contrib/libs/openldap/libraries/liblmdb/mdb.c b/contrib/libs/openldap/libraries/liblmdb/mdb.c index 0570deab232..668f9660f26 100644 --- a/contrib/libs/openldap/libraries/liblmdb/mdb.c +++ b/contrib/libs/openldap/libraries/liblmdb/mdb.c @@ -1555,7 +1555,7 @@ mdb_strerror(int err) buf[0] = 0; FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, err, 0, ptr, MSGSIZE, (va_list *)buf+MSGSIZE); + NULL, err, 0, ptr, MSGSIZE, NULL); return ptr; #else if (err < 0) @@ -2796,9 +2796,14 @@ mdb_txn_renew0(MDB_txn *txn) do /* LY: Retry on a race, ITS#7970. */ r->mr_txnid = ti->mti_txnid; while(r->mr_txnid != ti->mti_txnid); + if (!r->mr_txnid && (env->me_flags & MDB_RDONLY)) { + meta = mdb_env_pick_meta(env); + r->mr_txnid = meta->mm_txnid; + } else { + meta = env->me_metas[r->mr_txnid & 1]; + } txn->mt_txnid = r->mr_txnid; txn->mt_u.reader = r; - meta = env->me_metas[txn->mt_txnid & 1]; } } else { @@ -5701,7 +5706,7 @@ mdb_page_search(MDB_cursor *mc, MDB_val *key, int flags) MDB_node *leaf = mdb_node_search(&mc2, &mc->mc_dbx->md_name, &exact); if (!exact) - return MDB_NOTFOUND; + return MDB_BAD_DBI; if ((leaf->mn_flags & (F_DUPDATA|F_SUBDATA)) != F_SUBDATA) return MDB_INCOMPATIBLE; /* not a named DB */ rc = mdb_node_read(&mc2, leaf, &data); diff --git a/contrib/libs/openldap/libraries/liblmdb/midl.c b/contrib/libs/openldap/libraries/liblmdb/midl.c index 1cbe879606f..dc3a1f578cd 100644 --- a/contrib/libs/openldap/libraries/liblmdb/midl.c +++ b/contrib/libs/openldap/libraries/liblmdb/midl.c @@ -3,7 +3,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software <http://www.openldap.org/>. * - * Copyright 2000-2022 The OpenLDAP Foundation. + * Copyright 2000-2024 The OpenLDAP Foundation. * Portions Copyright 2001-2021 Howard Chu, Symas Corp. * All rights reserved. * diff --git a/contrib/libs/openldap/libraries/liblmdb/midl.h b/contrib/libs/openldap/libraries/liblmdb/midl.h index ff740aee82d..1abdc8af2ad 100644 --- a/contrib/libs/openldap/libraries/liblmdb/midl.h +++ b/contrib/libs/openldap/libraries/liblmdb/midl.h @@ -11,7 +11,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software <http://www.openldap.org/>. * - * Copyright 2000-2022 The OpenLDAP Foundation. + * Copyright 2000-2024 The OpenLDAP Foundation. * Portions Copyright 2001-2021 Howard Chu, Symas Corp. * All rights reserved. * diff --git a/contrib/libs/openldap/libraries/liblunicode/ucdata/ucdata.h b/contrib/libs/openldap/libraries/liblunicode/ucdata/ucdata.h index 30674631f71..3ab6178022c 100644 --- a/contrib/libs/openldap/libraries/liblunicode/ucdata/ucdata.h +++ b/contrib/libs/openldap/libraries/liblunicode/ucdata/ucdata.h @@ -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/contrib/libs/openldap/ya.make b/contrib/libs/openldap/ya.make index d1d7f316602..76065b62e83 100644 --- a/contrib/libs/openldap/ya.make +++ b/contrib/libs/openldap/ya.make @@ -14,9 +14,9 @@ LICENSE( LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(2.6.7) +VERSION(2.6.8) -ORIGINAL_SOURCE(https://gitlab.com/api/v4/projects/openldap%2Fopenldap/repository/archive.tar.gz?sha=OPENLDAP_REL_ENG_2_6_7) +ORIGINAL_SOURCE(https://gitlab.com/api/v4/projects/openldap%2Fopenldap/repository/archive.tar.gz?sha=OPENLDAP_REL_ENG_2_6_8) PEERDIR( contrib/libs/openldap/libraries/liblber |