ldb_tdb: Avoid reading the index list from the DB if we are already set to override it

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>

diff --git a/lib/ldb/ldb_tdb/ldb_cache.c b/lib/ldb/ldb_tdb/ldb_cache.c
index cf25d9afa98e0ad6a530208c672f816e56f87a7f..f08e073af1a182d554211ff01774287d04d43a8b 100644 (file)
--- a/lib/ldb/ldb_tdb/ldb_cache.c
+++ b/lib/ldb/ldb_tdb/ldb_cache.c
@@ -236,6 +236,16 @@ static int ltdb_index_load(struct ldb_module *module,
        struct ldb_dn *indexlist_dn;
        int r;
 
+       if (ldb->schema.index_handler_override) {
+               /*
+                * we skip loading the @INDEXLIST record when a module is
+                * supplying its own attribute handling
+                */
+               ltdb->cache->attribute_indexes = true;
+               ltdb->cache->one_level_indexes = ldb->schema.one_level_indexes;
+               return 0;
+       }
+
        talloc_free(ltdb->cache->indexlist);
 
        ltdb->cache->indexlist = ldb_msg_new(ltdb->cache);