]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
dbwrap: Fix "use mmap = no"
authorVolker Lendecke <vl@samba.org>
Wed, 11 Apr 2018 06:01:38 +0000 (08:01 +0200)
committerVolker Lendecke <vl@samba.org>
Thu, 12 Apr 2018 21:04:17 +0000 (23:04 +0200)
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

source3/lib/dbwrap/dbwrap_open.c

index a6bf30f0ae78bbd1086830c9f5cf6db708c291bd..658ccb602a89ec13f94c161289efaa17698f64cb 100644 (file)
@@ -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;
                }