sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

ldb_tdb: Remove the idxptr DB before we re-index

Browse Source 
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>
This commit is contained in:
Andrew Bartlett 2017-06-09 14:09:30 +12:00 committed by Garming Sam
parent d8f3034c16
commit f6f73f7091
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/ldb/ldb_tdb/ldb_index.c
View File

@ -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
*/