56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
From 9f265d6f3b852a9eed9f19147585fe2801507f63 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schneider <asn@samba.org>
|
|
Date: Tue, 24 Sep 2024 15:48:23 +0200
|
|
Subject: [PATCH] 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 <asn@samba.org>
|
|
---
|
|
lib/ldb/wscript | 22 +++++++++-------------
|
|
1 file changed, 9 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
|
|
index 87aa3bb6d77..f234fa79c10 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
|
|
--
|
|
GitLab
|
|
|