large(ish) commits in [2.5.13 .. 2.5.19]

Michael Tokarev mjt at tls.msk.ru
Sat Jan 11 15:37:52 GMT 2025


This is the list of large upstream commits between current version in bookworm
and last upstream stable release.  I'm thinking about updating openldap in
bookworm to the last upstream stable for the next point release (12.10),
somewhere in the first half of March-2025.

Let's keep it here for now so it isn't lost.

I pushed mjt-bookworm branch as a starting point.

/mjt

==================================================
There are several commits like this:

commit f19193316d05e15b78429cdaa7da3319e0b83e7e
Author: Quanah Gibson-Mount <quanah at openldap.org>
Date:   Thu May 9 17:12:24 2024 +0000

     ITS#10214 - regenerate configure

  aclocal.m4 |  90 ++++++++++++++++++++++++++++++++++++++++++------
  configure  | 114 +++++++++++++++++++------------------------------------------
  2 files changed, 114 insertions(+), 90 deletions(-)


==================================================
Large commit but is irrelevant for us (systemd support is not enabled in bookworm)

commit f7c76e2daff6d2fc0607b22ddd113d406e0fa1fc
Author: HAMANO Tsukasa <hamano at osstech.co.jp>
Date:   Tue May 7 19:59:17 2024 +0900

     ITS#10214 Reduce library dependencies

     Currently, slapd links libsystemd to notify service state to systemd.
     However, libsystemd link several unnecessary libraries, which increases security risks.
     The systemd documentation provides a method to send state notifications to systemd using a simple protocol without the need to link against 
libsystemd.

     https://www.freedesktop.org/software/systemd/man/devel/sd_notify.html

  build/top.mk                      |  3 +-
  configure.ac                      | 38 +++++++----------------
  include/sd-notify.h               | 64 +++++++++++++++++++++++++++++++++++++++
  servers/lloadd/Makefile_server.in |  2 --
  servers/lloadd/daemon.c           |  4 +--
  servers/slapd/daemon.c            |  4 +--
  6 files changed, 80 insertions(+), 35 deletions(-)


==================================================
A lot of changes, copyright years in every file

commit 2eadd1524ab9f3584dfafbb8539392f17badadce
Author: Quanah Gibson-Mount <quanah at openldap.org>
Date:   Tue Mar 26 19:46:02 2024 +0000

     Happy New Year!

  ....
  1295 files changed, 1312 insertions(+), 1312 deletions(-)


==================================================

todo

commit 0ce2afd8edf0a9013fe1b5e7226ea34e8c3617e8
Author: Nadezhda Ivanova <nivanova at symas.com>
Date:   Wed Feb 7 16:35:48 2024 +0200

     ITS#10164 back-meta hangs when used with dynlist overlay

     Make sure every proxied operation has a separate candidates structure.

  servers/slapd/back-meta/add.c        | 12 ++++---
  servers/slapd/back-meta/back-meta.h  | 12 ++++---
  servers/slapd/back-meta/bind.c       | 17 +++++----
  servers/slapd/back-meta/candidates.c |  4 +--
  servers/slapd/back-meta/compare.c    | 10 ++++--
  servers/slapd/back-meta/conn.c       | 68 +++++-------------------------------
  servers/slapd/back-meta/delete.c     | 10 ++++--
  servers/slapd/back-meta/modify.c     | 10 ++++--
  servers/slapd/back-meta/modrdn.c     | 10 ++++--
  servers/slapd/back-meta/search.c     |  9 ++---
  10 files changed, 67 insertions(+), 95 deletions(-)


==================================================
todo

commit c79abb6039cef7992dc82f9f6bade2a23d2103f1
Author: Ondřej Kuzník <ondra at mistotebe.net>
Date:   Thu Jan 25 12:50:48 2024 +0000

     ITS#10139 back-config: Honour disclose in matchedDN handling

  servers/slapd/bconfig.c | 36 ++++++++++++++++++++++--------------
  1 file changed, 22 insertions(+), 14 deletions(-)


commit a4026502f9e51ccb5ec37040f487b400d81875a3
Author: Howard Chu <hyc at openldap.org>
Date:   Fri Jan 5 14:01:16 2024 +0000

     ITS#10135 dynlist: fix search2resp callback context

  servers/slapd/overlays/dynlist.c | 33 +++++++++++++++++----------------
  1 file changed, 17 insertions(+), 16 deletions(-)


==================================================
bugfix

commit 43798262ce7810c0421b5aab729040e48d915c5b
Author: Stacey Marshall <stacey.marshall at gmail.com>
Date:   Tue Nov 14 16:36:16 2023 +0000

     ITS#10130 Several callers of getpassphrase() ignore NULL returns

  clients/tools/common.c     |  7 ++++---
  clients/tools/ldappasswd.c | 14 ++++++++++++--
  clients/tools/ldapvc.c     |  9 +++++++--
  servers/slapd/slappasswd.c | 13 +++++++++----
  tests/progs/slapd-tester.c |  3 +++
  5 files changed, 35 insertions(+), 11 deletions(-)


==================================================

commit 8fdcf120287fde00bef8c28b9625309126dfd8d2
Author: Ondřej Kuzník <ondra at mistotebe.net>
Date:   Thu Nov 9 15:55:53 2023 +0000

     ITS#10129 Fix lloadd.conf manpage

  doc/man/man5/lloadd.conf.5 | 52 +++++++++++++++++++++++-----------------------
  1 file changed, 26 insertions(+), 26 deletions(-)


==================================================

commit 110a78e51e351be0a779fbb19883d5742cd4ca47
Author: hyc <hyc at symas.com>
Date:   Wed Sep 20 19:43:23 2023 -0700

     ITS#10100 fix Windows timestamps

     Simplify, instead of trying to maintain offset between performance
     counter and systemtime, just use performance counter.

  libraries/libldap/util-int.c | 174 +++++++++++++------------------------------
  1 file changed, 51 insertions(+), 123 deletions(-)


==================================================

commit b003ae84176ed1e9d26b2bd8d50769fb2734f9a4
Author: Howard Chu <hyc at openldap.org>
Date:   Thu Oct 19 18:46:54 2023 +0100

     ITS#10117 build: fix slap-config.h decls for Windows DLLs

  servers/slapd/slap-config.h | 44 ++++++++++++++++++++++----------------------
  1 file changed, 22 insertions(+), 22 deletions(-)


==================================================

commit 5d7a9205e810c5cf07af66e062a52f4ceeb749d6
Author: Howard Chu <hyc at openldap.org>
Date:   Thu Sep 7 20:03:07 2023 +0100

     Cleanup Windows build

     Fix make depend errors in slapi

  servers/slapd/slapi/Makefile.in   | 12 ++++++------
  servers/slapd/slapi/printmsg.c    | 20 ++++++++++++++++++++
  servers/slapd/slapi/slapi_utils.c |  6 ++++++
  3 files changed, 32 insertions(+), 6 deletions(-)


==================================================
A large change, safety.
Probably the only change which is large and is not a bugfix,
but can be seen as a bugfix - to keep data safe in critical
places.

Author: Howard Chu <hyc at openldap.org>
Date:   Fri Dec 22 19:55:22 2023 +0000

     ITS#9378 Add replay tool

     Reads a replay log and executes all the write ops

  libraries/liblmdb/Makefile |   1 +
  libraries/liblmdb/mplay.c  | 582 +++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 583 insertions(+)

commit 4a19b804cfabe0c8c56da26e4052f2d585a10361
Author: Howard Chu <hyc at openldap.org>
Date:   Fri Dec 22 13:14:32 2023 +0000

     ITS#9378 Add explicit replay logging

     Logs essential ops so they can be replayed.
     Ignores read ops for now.

  libraries/liblmdb/mdb.c | 138 +++++++++++++++++++++++++++++++++++++++---------
  1 file changed, 112 insertions(+), 26 deletions(-)


==================================================
Large change

commit 7b693aadc1572982886c719ce1ef477f4f815951
Author: Greg Burd <gburd at symas.com>
Date:   Thu Aug 10 12:39:15 2023 -0400

     ITS#10089 - convert Debug to use config args

  servers/slapd/aclparse.c | 816 ++++++++++++++++++++++-------------------------
  1 file changed, 387 insertions(+), 429 deletions(-)


==================================================

commit f58a44f63ea7c8e0eee57e25e8560a8730d28272
Author: Howard Chu <hyc at openldap.org>
Date:   Fri Mar 18 16:34:40 2022 +0000

     ITS#10089 - Use ConfigArgs in ACL parsing

     For better error propagation back to config clients, also
     remove unconditional use of stderr.

     parse_acl() was only partially converted, the rest remains to be done.

  servers/slapd/aci.c        | 26 ++++++++++++++------------
  servers/slapd/aclparse.c   | 32 +++++++++++++++++---------------
  servers/slapd/bconfig.c    |  9 +++++++--
  servers/slapd/proto-slap.h |  4 +---
  servers/slapd/slap.h       |  6 ++++--
  5 files changed, 43 insertions(+), 34 deletions(-)


commit b857c53829ac519cb7d71386f2cc7fe0a7f746ce
Author: Howard Chu <hyc at openldap.org>
Date:   Tue Mar 22 16:01:59 2022 +0000

     ITS#10089 - Use ConfigArgs in slapi config parsing

  servers/slapd/bconfig.c           |  2 +-
  servers/slapd/slapi/plugin.c      | 71 +++++++++++++++++++--------------------
  servers/slapd/slapi/proto-slapi.h |  3 +-
  3 files changed, 37 insertions(+), 39 deletions(-)


==================================================

commit 760406ee29ecf39bbd94faa4f53f8473b68cd052
Author: Greg Burd <gburd at symas.com>
Date:   Tue Aug 8 11:08:22 2023 -0400

     ITS#10089 - Allow caller to determine if the process should exit or not when the regex is found to be problematic.

  servers/slapd/aclparse.c | 28 ++++++++++++++++++----------
  1 file changed, 18 insertions(+), 10 deletions(-)


==================================================

commit 2816cb80b42fda9bda6c5e909c42bc06ad1cece9
Author: Ondřej Kuzník <ondra at mistotebe.net>
Date:   Mon Jun 19 15:41:09 2023 +0100

     ITS#10067 Account for mods being optional

  servers/slapd/back-asyncmeta/modify.c | 14 +++++---------
  servers/slapd/back-meta/modify.c      | 19 ++++---------------
  2 files changed, 9 insertions(+), 24 deletions(-)


==================================================
testing change

commit aa08e8f7c227df8541387bec15636663f21d1f41
Author: Ondřej Kuzník <ondra at mistotebe.net>
Date:   Wed May 24 13:20:05 2023 +0100

     Check slapadd result before continuing with test

  tests/scripts/lloadd/test001-backend-issues        |  1 +
  tests/scripts/lloadd/test002-load                  |  1 +
  tests/scripts/lloadd/test003-cnconfig              |  1 +
  tests/scripts/lloadd/test004-monitor               |  1 +
  tests/scripts/test049-sync-config                  | 13 +++++++++++++
  tests/scripts/test050-syncrepl-multiprovider       |  5 +++++
  tests/scripts/test053-syncprov-glue                | 15 +++++++++++++++
  tests/scripts/test058-syncrepl-asymmetric          | 12 ++++++++++++
  tests/scripts/test059-consumer-config              | 13 +++++++++++++
  tests/scripts/test061-syncreplication-initiation   |  6 ++++++
  tests/scripts/test062-config-delete                |  6 ++++++
  tests/scripts/test063-delta-multiprovider          |  6 ++++++
  tests/scripts/test064-constraint                   |  5 +++++
  tests/scripts/test066-autoca                       |  6 ++++++
  tests/scripts/test069-delta-multiprovider-starttls |  7 +++++++
  tests/scripts/test070-delta-multiprovider-ldaps    |  6 ++++++
  tests/scripts/test071-dirsync                      |  7 +++++++
  tests/scripts/test076-authid-rewrite               |  6 ++++++
  tests/scripts/test078-persistent-sessionlog        |  6 ++++++
  tests/scripts/test083-argon2                       |  5 +++++
  tests/scripts/test086-delta-consumer-config        | 13 +++++++++++++
  21 files changed, 141 insertions(+)


==================================================

commit 2fff2b7fc1ed7ccd8d608a395cc36045f78c6adb
Author: Ondřej Kuzník <ondra at mistotebe.net>
Date:   Tue May 9 13:11:46 2023 +0100

     ITS#10048 Improve regex config error handling

  .../variant/tests/data/test001-04a-same-regex.ldif |  4 +++
  .../variant/tests/data/test001-04b-same-regex.ldif |  4 +++
  contrib/slapd-modules/variant/variant.c            | 33 ++++++++++++++++++----
  3 files changed, 36 insertions(+), 5 deletions(-)


==================================================

commit 9391e92e918b1128b13c9a31e536f2634cf735a1
Author: Ondřej Kuzník <ondra at mistotebe.net>
Date:   Tue May 9 13:10:27 2023 +0100

     ITS#9855 Adapt other contrib module's tests

  contrib/slapd-modules/datamorph/tests/run | 214 +-----------------------------
  contrib/slapd-modules/emptyds/tests/run   | 203 +---------------------------
  contrib/slapd-modules/variant/tests/run   | 214 +-----------------------------
  3 files changed, 3 insertions(+), 628 deletions(-)


==================================================

commit c5b0998324b0a1173e07afd8ab28f856e1ce6497
Author: Ondřej Kuzník <ondra at mistotebe.net>
Date:   Mon Apr 24 12:32:05 2023 +0100

     ITS#10041 Restrict group searching

  servers/slapd/overlays/dynlist.c | 124 ++++++++++++++++++++++++++++++++++-----
  1 file changed, 110 insertions(+), 14 deletions(-)


==================================================

commit 58dd1467ca452f9b609c56513433a509eb1e411d
Author: Ondřej Kuzník <ondra at mistotebe.net>
Date:   Thu Apr 27 15:24:03 2023 +0100

     ITS#10045 Also check for abandon when things have settled

  servers/slapd/bconfig.c | 39 ++++++++++++++++++++++++++++++++++++---
  1 file changed, 36 insertions(+), 3 deletions(-)

commit a4ec923fd6508dfd48a653a39ab5216a5b0f2b67
Author: Howard Chu <hyc at openldap.org>
Date:   Mon Feb 27 15:01:23 2023 +0000

     ITS#10016: slapo-syncprov: fix Abandon with active qtask

  servers/slapd/overlays/syncprov.c | 42 +++++++++++++++++++++++++++++++++------
  1 file changed, 36 insertions(+), 6 deletions(-)


==================================================

commit 4a9aaf7c2621c2800b163efe928512c20bd422e2
Author: Sam James <sam at gentoo.org>
Date:   Thu Feb 9 23:17:53 2023 +0000

     ITS#10011 build: fix compatibility with stricter C99 compilers

     Fix the following warnings:
     - -Wimplicit-int (fatal with Clang 16)
     - -Wimplicit-function-declaration (fatal with Clang 16)
     - -Wincompatible-function-pointer-types (fatal with Clang 16)
     - -Wint-conversion (fatal with Clang 15)
     - Old style prototypes (K&R, removed from C23)

     These warnings-now-error led to misconfigurations and failure to build
     OpenLDAP, as the tests used during configure caused the wrong results
     to be emitted.

     For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2],
     or the (new) c-std-porting mailing list [3].

     [0] https://lwn.net/Articles/913505/
     [1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
     [2] https://wiki.gentoo.org/wiki/Modern_C_porting
     [3] hosted at lists.linux.dev.

     Bug: https://bugs.gentoo.org/871288
     Signed-off-by: Sam James <sam at gentoo.org>

  build/openldap.m4 | 16 +++++++++++++---
  configure.ac      | 29 +++++++++++++++++++++--------
  2 files changed, 34 insertions(+), 11 deletions(-)


==================================================

commit 1dc911bd204f448d093a3e8793913dc26106bdf2
Author: Ondřej Kuzník <ondra at mistotebe.net>
Date:   Wed Jan 18 13:03:23 2023 +0000

     ITS#9983 Rework op->o_refcnt decref sequencing

     epoch_append should be called at the point the object is not reachable
     anymore, otherwise a thread from a "future" might still access it post
     reclamation.

  servers/lloadd/bind.c       |  4 ++--
  servers/lloadd/client.c     |  8 ++++----
  servers/lloadd/connection.c |  2 +-
  servers/lloadd/epoch.c      | 11 +++++++++--
  servers/lloadd/epoch.h      |  6 +++++-
  servers/lloadd/extended.c   |  4 ++--
  servers/lloadd/lload.h      |  6 +++++-
  servers/lloadd/operation.c  | 13 ++++---------
  servers/lloadd/upstream.c   |  2 +-
  9 files changed, 33 insertions(+), 23 deletions(-)


==================================================

commit 211e789db823648c95cc3c538de42b05a684716e
Author: Howard Chu <hyc at openldap.org>
Date:   Mon Dec 12 11:50:43 2022 +0000

     ITS#9957 slapo-dynlist: more explicit config doc

  doc/man/man5/slapo-dynlist.5 | 59 ++++++++++++++++++++++++++++----------------
  1 file changed, 38 insertions(+), 21 deletions(-)


==================================================

commit febb37db6d277c293df5a5c68c7eab79f2017118
Author: Howard Chu <hyc at openldap.org>
Date:   Wed Nov 30 19:28:04 2022 +0000

     ITS#9929 plug memleaks

  servers/slapd/ava.c              | 16 ++++++++++
  servers/slapd/backend.c          |  3 +-
  servers/slapd/filter.c           |  7 +----
  servers/slapd/overlays/dynlist.c | 64 ++++++++++------------------------------
  servers/slapd/proto-slap.h       |  3 ++
  5 files changed, 37 insertions(+), 56 deletions(-)


==================================================

commit 7167fac7a265bd2aedef214d4c8cbf4e778f41d4
Author: Howard Chu <hyc at openldap.org>
Date:   Wed Nov 30 18:14:15 2022 +0000

     ITS#9121 dynlist: cleanup unused code

  servers/slapd/overlays/dynlist.c | 29 -----------------------------
  1 file changed, 29 deletions(-)


==================================================

commit 7b9c77dbf226be9cae40dc50cfc49bd90e28fd84
Author: Howard Chu <hyc at openldap.org>
Date:   Mon Nov 14 17:48:24 2022 +0000

     ITS#9929 preserve e_name for memberOf values

  servers/slapd/overlays/dynlist.c |  37 ++++++-----
  tests/data/dynlist.out           | 136 +++++++++++++++++++--------------------
  2 files changed, 89 insertions(+), 84 deletions(-)


==================================================

commit 9603dddd2ca08dabc83915ee6467f9d960090585
Author: Howard Chu <hyc at openldap.org>
Date:   Thu Nov 3 17:42:36 2022 +0000

     ITS#9929: more performance tweaks

     For simple (non-nested) member compares, avoid unnecessary fetches
     of dyngroups that can't match the filter.
     cache filter/entry instance info across multiple dyn entries to
     avoid refetching each filter entry for each dyngruop test.

  servers/slapd/overlays/dynlist.c | 193 ++++++++++++++++++++++++++++++++-------
  tests/data/dynlist.out           |  59 ++++++++++++
  tests/scripts/test044-dynlist    |  15 ++-
  3 files changed, 233 insertions(+), 34 deletions(-)

commit 1911fd13b958bff3c1f5862444c4b74f84436bf5
Author: Howard Chu <hyc at openldap.org>
Date:   Wed Oct 19 16:21:42 2022 +0100

     ITS#9929 slapo-dynlist: more performance tweaks

     Minimize cost of dynamic lists while still making them filterable:
     require their attrs to be explicitly mapped if filtering is to be supported.

     Also check config scope in compare op

  doc/man/man5/slapo-dynlist.5     | 23 +++++++++++-
  servers/slapd/overlays/dynlist.c | 80 +++++++++++++++++++++++-----------------
  tests/data/slapd-dynlist.conf    |  2 +-
  3 files changed, 69 insertions(+), 36 deletions(-)

commit b98ee4088dfcb8addc7822c82b1190241116f401
Author: Howard Chu <hyc at openldap.org>
Date:   Sun Oct 9 11:51:54 2022 +0100

     ITS#9929 dynlist: avoid unnecessary search for dynamic lists

     Was broken if only dynamic lists were configured, and not groups. Optional config URIs were being ignored. Don't prevent returning dynamic lists 
if dynamic groups were part of search.

  servers/slapd/overlays/dynlist.c | 191 +++++++++++++++++++++++++--------------
  1 file changed, 124 insertions(+), 67 deletions(-)


==================================================

commit f6854b2a67b5cd05dfa75444645ccb03f306aa3e
Author: Ondřej Kuzník <ondra at mistotebe.net>
Date:   Mon Nov 7 09:44:12 2022 +0000

     ITS#9947 Fix race in epoch.c and simplify

  servers/lloadd/epoch.c | 75 +++++++++++++++++---------------------------------
  1 file changed, 25 insertions(+), 50 deletions(-)


==================================================

commit 139831a5c0665918cca16730bde0eb697c1f6c34
Author: Howard Chu <hyc at openldap.org>
Date:   Tue Nov 15 15:33:48 2022 +0000

     ITS#9916 liblmdb: use alternate MDB_page2 struct for some accesses

     fakepage pointers are only guaranteed to be 2-byte aligned. Use a
     2-byte aligned struct definition when referencing 2-byte page members
     if a page pointer possibly points to a fakepage.

  libraries/liblmdb/mdb.c | 135 +++++++++++++++++++++++++++---------------------
  1 file changed, 77 insertions(+), 58 deletions(-)


==================================================
tests only

commit ffd05c988e762634216c718f7b3bab68d3f99a78
Author: Howard Chu <hyc at openldap.org>
Date:   Tue Oct 11 14:06:46 2022 +0100

     ITS#9931 test079: fix ldapsearch invocations

  tests/scripts/test079-proxy-timeout | 60 ++++++++++++++++++-------------------
  1 file changed, 30 insertions(+), 30 deletions(-)


==================================================

commit 739f4666d88fabc22743a2f6f36182c6a329ffde
Author: Ondřej Kuzník <ondra at mistotebe.net>
Date:   Thu Sep 15 09:14:10 2022 +0100

     ITS#9892 Free operation data at the end of a transaction

  servers/slapd/add.c |  2 +-
  servers/slapd/txn.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 47 insertions(+), 1 deletion(-)


==================================================

commit 2185220f8377155e3da7655b89f8c7fd151010d9
Author: Howard Chu <hyc at openldap.org>
Date:   Sun Aug 7 02:42:33 2022 +0100

     ITS#9894 don't use gmake-specific features

  configure.ac                      | 16 ++++++++--------
  libraries/liblber/Makefile.in     |  4 +---
  libraries/libldap/Makefile.in     |  4 +---
  servers/lloadd/Makefile.in        | 11 ++++++-----
  servers/lloadd/Makefile_module.in | 23 +++--------------------
  servers/lloadd/Makefile_server.in | 24 ++++++------------------
  6 files changed, 25 insertions(+), 57 deletions(-)


==================================================

commit a005f74f2f56a7be127a57229b83418783d1c888
Author: Howard Chu <hyc at openldap.org>
Date:   Sat Jul 23 21:54:29 2022 +0100

     ITS#9860 ldapsearch: fix control memleaks

  clients/tools/ldapsearch.c | 48 ++++++++++++++++++++++++----------------------
  1 file changed, 25 insertions(+), 23 deletions(-)




More information about the Pkg-openldap-devel mailing list