From 422722aad2e50465627a2f7b249c251652297a7b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 6 Jun 2007 13:02:14 +0000
Subject: r23367: check the "use mmap" option for ldb too (This used to be
 commit 15345bbc73b28d07c069fde33d3d4c1f21f107d3)

---
 source3/groupdb/mapping_ldb.c     | 4 ++++
 source3/lib/ldb/include/ldb.h     | 5 +++++
 source3/lib/ldb/ldb_tdb/ldb_tdb.c | 5 +++++
 3 files changed, 14 insertions(+)

(limited to 'source3')

diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c
index 8eafc2532b..4f3aa18534 100644
--- a/source3/groupdb/mapping_ldb.c
+++ b/source3/groupdb/mapping_ldb.c
@@ -67,6 +67,10 @@ static BOOL init_group_mapping(void)
 		flags |= LDB_FLG_NOSYNC;
 	}
 
+	if (!lp_use_mmap()) {
+		flags |= LDB_FLG_NOMMAP;
+	}
+
 	ret = ldb_connect(ldb, db_path, flags, NULL);
 	if (ret != LDB_SUCCESS) {
 		goto failed;
diff --git a/source3/lib/ldb/include/ldb.h b/source3/lib/ldb/include/ldb.h
index 44f9e5f3df..f96b90a1b2 100644
--- a/source3/lib/ldb/include/ldb.h
+++ b/source3/lib/ldb/include/ldb.h
@@ -233,6 +233,11 @@ struct ldb_utf8_fns {
 */
 #define LDB_FLG_RECONNECT 4
 
+/**
+   Flag to tell backends not to use mmap
+*/
+#define LDB_FLG_NOMMAP 8
+
 /*
    structures for ldb_parse_tree handling code
 */
diff --git a/source3/lib/ldb/ldb_tdb/ldb_tdb.c b/source3/lib/ldb/ldb_tdb/ldb_tdb.c
index fead100f72..8b53982fdb 100644
--- a/source3/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/source3/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -1029,6 +1029,11 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url,
 		tdb_flags |= TDB_NOSYNC;
 	}
 
+	/* and nommap option */
+	if (flags & LDB_FLG_NOMMAP) {
+		tdb_flags |= TDB_NOMMAP;
+	}
+
 	if (flags & LDB_FLG_RDONLY) {
 		open_flags = O_RDONLY;
 	} else {
-- 
cgit