summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2017-06-30 06:24:01 +0200
committerKarolin Seeger <kseeger@samba.org>2017-07-03 15:15:14 +0200
commitcb6771c88a2284d1bbc99e1b2ef0e40717882ffa (patch)
treed41abff54db434dae08fb5d10f4cf6447aa391c9
parent85dbd4dc6e8c00a8f3f3912fac86278d80a868da (diff)
downloadsamba-cb6771c88a2284d1bbc99e1b2ef0e40717882ffa.tar.gz
ldb: protect Samba < 4.7 against incompatible ldb versions and require ldb < 1.2.0
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12859 Signed-off-by: Stefan Metzmacher <metze@samba.org> Autobuild-User(v4-6-test): Karolin Seeger <kseeger@samba.org> Autobuild-Date(v4-6-test): Mon Jul 3 15:15:14 CEST 2017 on sn-devel-144
-rwxr-xr-xlib/ldb/wscript19
1 files changed, 17 insertions, 2 deletions
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 7f05db3992a..dd68d66c139 100755
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -55,11 +55,26 @@ def configure(conf):
conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
if not conf.env.standalone_ldb:
- if conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', minversion=VERSION,
+ #
+ # ldb >= 1.2.0 (as well as 1.1.30 and 1.1.31) are
+ # incompatible with Samba < 4.7
+ #
+ # See https://bugzilla.samba.org/show_bug.cgi?id=12859
+ #
+ maxversion = "1.1.99"
+ version_blacklist = ["1.1.30", "1.1.31"]
+
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util',
+ minversion=VERSION,
+ maxversion=maxversion,
+ version_blacklist=version_blacklist,
onlyif='talloc tdb tevent',
implied_deps='replace talloc tdb tevent ldb'):
conf.define('USING_SYSTEM_PYLDB_UTIL', 1)
- if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', minversion=VERSION,
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb',
+ minversion=VERSION,
+ maxversion=maxversion,
+ version_blacklist=version_blacklist,
onlyif='talloc tdb tevent pyldb-util',
implied_deps='replace talloc tdb tevent'):
conf.define('USING_SYSTEM_LDB', 1)