From 15345bbc73b28d07c069fde33d3d4c1f21f107d3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 6 Jun 2007 13:02:14 +0000 Subject: [PATCH 1/1] r23367: check the "use mmap" option for ldb too --- source/groupdb/mapping_ldb.c | 4 ++++ source/lib/ldb/include/ldb.h | 5 +++++ source/lib/ldb/ldb_tdb/ldb_tdb.c | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/source/groupdb/mapping_ldb.c b/source/groupdb/mapping_ldb.c index 8eafc2532b4..4f3aa185340 100644 --- a/source/groupdb/mapping_ldb.c +++ b/source/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/source/lib/ldb/include/ldb.h b/source/lib/ldb/include/ldb.h index 44f9e5f3df7..f96b90a1b2d 100644 --- a/source/lib/ldb/include/ldb.h +++ b/source/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/source/lib/ldb/ldb_tdb/ldb_tdb.c b/source/lib/ldb/ldb_tdb/ldb_tdb.c index fead100f728..8b53982fdb3 100644 --- a/source/lib/ldb/ldb_tdb/ldb_tdb.c +++ b/source/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 { -- 2.34.1