diff options
| author | Volker Lendecke <vl@samba.org> | 2018-04-11 08:01:38 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2018-04-12 23:04:17 +0200 |
| commit | 23d841036d3ba8f2c80bee4edc89049533524e68 (patch) | |
| tree | 6003229331034a12d36e469f79b3a0d4fc0f92a4 | |
| parent | 40edd1bc273f664d5567ef5be169033899acee1f (diff) | |
| download | samba-23d841036d3ba8f2c80bee4edc89049533524e68.tar.gz | |
dbwrap: Fix "use mmap = no"
Mutexes require mmap.
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Thu Apr 12 23:04:18 CEST 2018 on sn-devel-144
| -rw-r--r-- | source3/lib/dbwrap/dbwrap_open.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c index a6bf30f0ae7..658ccb602a8 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; } |