The branch, v4-21-test has been updated
via f36c7d623ba s4:lib/messaging: fix interaction between
imessaging_reinit and irpc_destructor
via 0b3e0bc2920 ldb: Build lmdb backend also in non-AD case
from aabaf6aaf55 lib:ldb: Document environment variables in ldb manpage
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-21-test
- Log -----------------------------------------------------------------
commit f36c7d623bafe6c53131adc09cd4e25f2012f848
Author: Stefan Metzmacher <[email protected]>
Date: Tue Sep 17 08:29:42 2024 +0200
s4:lib/messaging: fix interaction between imessaging_reinit and
irpc_destructor
This was missing in commit 0d096931196524a2d1bf59470bc629dc9231131e.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15280
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
Autobuild-User(master): Stefan Metzmacher <[email protected]>
Autobuild-Date(master): Wed Sep 18 19:45:56 UTC 2024 on atb-devel-224
(cherry picked from commit a14320461e3abb56f5dacc90ca73bc1143270394)
Autobuild-User(v4-21-test): Jule Anger <[email protected]>
Autobuild-Date(v4-21-test): Wed Oct 2 16:46:27 UTC 2024 on atb-devel-224
commit 0b3e0bc29200efa4577fd40d9cf8a6a7d7c5d7ba
Author: Andreas Schneider <[email protected]>
Date: Tue Sep 24 15:48:23 2024 +0200
ldb: Build lmdb backend also in non-AD case
We should build with lmdb support also if it is not in AD case. The lmdb
backend is also used e.g. by sssd.
If you don't want to build it, you can always specify --without-ldb-lmdb
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15721
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Douglas Bagnall <[email protected]>
Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Wed Sep 25 05:36:13 UTC 2024 on atb-devel-224
(cherry picked from commit fdef894d79793feafc286ff9e21cb01e4c777b26)
-----------------------------------------------------------------------
Summary of changes:
lib/ldb/wscript | 22 +++++++++-------------
source4/lib/messaging/messaging.c | 9 +++++++++
2 files changed, 18 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 8ae95cbd6d6..ab33f7784a6 100644
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -33,21 +33,17 @@ def configure(conf):
conf.CONFIG_GET('ENABLE_SELFTEST'):
Logs.warn("NOTE: Some AD DC parts of selftest will fail")
+ conf.env.REQUIRE_LMDB = False
+ elif Options.options.without_ldb_lmdb:
+ if not Options.options.without_ad_dc and \
+ conf.CONFIG_GET('ENABLE_SELFTEST'):
+ raise Errors.WafError('--without-ldb-lmdb conflicts '
+ 'with --enable-selftest while '
+ 'building the AD DC')
+
conf.env.REQUIRE_LMDB = False
else:
- if Options.options.without_ad_dc:
- conf.env.REQUIRE_LMDB = False
- else:
- if Options.options.without_ldb_lmdb:
- if not Options.options.without_ad_dc and \
- conf.CONFIG_GET('ENABLE_SELFTEST'):
- raise Errors.WafError('--without-ldb-lmdb conflicts '
- 'with --enable-selftest while '
- 'building the AD DC')
-
- conf.env.REQUIRE_LMDB = False
- else:
- conf.env.REQUIRE_LMDB = True
+ conf.env.REQUIRE_LMDB = True
# if lmdb support is enabled then we require lmdb
# is present, build the mdb back end and enable lmdb support in
diff --git a/source4/lib/messaging/messaging.c
b/source4/lib/messaging/messaging.c
index 8d76f17367a..aa923165255 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -440,6 +440,15 @@ void imessaging_dgm_unref_ev(struct tevent_context *ev)
static NTSTATUS imessaging_reinit(struct imessaging_context *msg)
{
int ret = -1;
+ struct irpc_request *irpc = NULL;
+ struct irpc_request *next = NULL;
+
+ for (irpc = msg->requests; irpc != NULL; irpc = next) {
+ next = irpc->next;
+
+ DLIST_REMOVE(msg->requests, irpc);
+ irpc->callid = -1;
+ }
TALLOC_FREE(msg->msg_dgm_ref);
--
Samba Shared Repository
