ldb_tdb: Remove the idxptr DB before we re-index

We do not want the cache or any of the values in it, we want to read the real DB
@INDEX: records.

This matters if a re-index is tiggered in the same transaction
as the modify of the values in the index.  Otherwise we won't see
the old index record (it will not show up in the tdb_traverse)
and so fail to remove it.

That in turn can cause a spurious unqiue index violation.

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

diff --git a/lib/ldb/ldb_tdb/ldb_index.c b/lib/ldb/ldb_tdb/ldb_index.c
index e1e54ba38dbdd6e476528767a66ca8d3aa58ccec..76f3cb392e211a0c5f1b748a648ee99447125a6b 100644 (file)
--- a/lib/ldb/ldb_tdb/ldb_index.c
+++ b/lib/ldb/ldb_tdb/ldb_index.c
@@ -1655,6 +1655,18 @@ int ltdb_reindex(struct ldb_module *module)
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
+       /*
+        * Ensure we read (and so remove) the entries from the real
+        * DB, no values stored so far are any use as we want to do a
+        * re-index
+        */
+       ltdb_index_transaction_cancel(module);
+
+       ret = ltdb_index_transaction_start(module);
+       if (ret != LDB_SUCCESS) {
+               return ret;
+       }
+
        /* first traverse the database deleting any @INDEX records by
         * putting NULL entries in the in-memory tdb
         */