From 1a559fd6a9026d72c3cd50d97c454081e9532068 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 11 Jul 2018 13:41:58 +1200 Subject: [PATCH] ldb: Ban ldb 1.4.x with Samba 4.8 and earlier BUG: https://bugzilla.samba.org/show_bug.cgi?id=13519 Signed-off-by: Andrew Bartlett Reviewed-by: Gary Lockyer --- lib/ldb/include/ldb_module.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/ldb/include/ldb_module.h b/lib/ldb/include/ldb_module.h index fd88c6218eb..6ba2a49300a 100644 --- a/lib/ldb/include/ldb_module.h +++ b/lib/ldb/include/ldb_module.h @@ -54,18 +54,18 @@ #endif /* - * Only Samba versions which expect ldb >= 1.2.0 - * are compatible with read_[un]lock() behaviour. + * Only Samba versions which expect ldb >= 1.4.0 + * reopen the ldb after each fork(). * - * See https://bugzilla.samba.org/show_bug.cgi?id=12859 + * See https://bugzilla.samba.org/show_bug.cgi?id=13519 */ #if EXPECTED_SYSTEM_LDB_VERSION_MAJOR > 1 -#define __LDB_READ_LOCK_COMPATIBLE__ 1 -#elif EXPECTED_SYSTEM_LDB_VERSION_MINOR > 1 -#define __LDB_READ_LOCK_COMPATIBLE__ 1 +#define __LDB_FORK_COMPATIBLE__ 1 +#elif EXPECTED_SYSTEM_LDB_VERSION_MINOR > 3 +#define __LDB_FORK_COMPATIBLE__ 1 #endif -#ifndef __LDB_READ_LOCK_COMPATIBLE__ -#error "Samba < 4.7 is not compatible with this version of ldb due to assumptions around read locks" +#ifndef __LDB_FORK_COMPATIBLE__ +#error "Samba < 4.9 is not compatible with this version of ldb due to assumptions around fork() behaviour" #endif #endif /* defined(_SAMBA_BUILD_) && defined(USING_SYSTEM_LDB) */