The branch, master has been updated
via 23d8410 dbwrap: Fix "use mmap = no"
from 40edd1b torture: Test compound request request counters
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 23d841036d3ba8f2c80bee4edc89049533524e68
Author: Volker Lendecke <[email protected]>
Date: Wed Apr 11 08:01:38 2018 +0200
dbwrap: Fix "use mmap = no"
Mutexes require mmap.
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Thu Apr 12 23:04:18 CEST 2018 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
source3/lib/dbwrap/dbwrap_open.c | 9 +++++++++
1 file changed, 9 insertions(+)
Changeset truncated at 500 lines:
diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c
index a6bf30f..658ccb6 100644
--- a/source3/lib/dbwrap/dbwrap_open.c
+++ b/source3/lib/dbwrap/dbwrap_open.c
@@ -111,6 +111,15 @@ struct db_context *db_open(TALLOC_CTX *mem_ctx,
try_mutex = lp_parm_bool(-1, "dbwrap_tdb_mutexes", "*",
try_mutex);
try_mutex = lp_parm_bool(-1, "dbwrap_tdb_mutexes", base,
try_mutex);
+ if (!lp_use_mmap()) {
+ /*
+ * Mutexes require mmap. "use mmap = no" can
+ * be a debugging tool, so let it override the
+ * mutex parameters
+ */
+ try_mutex = false;
+ }
+
if (try_mutex && tdb_runtime_check_for_robust_mutexes()) {
tdb_flags |= TDB_MUTEX_LOCKING;
}
--
Samba Shared Repository
