ldb_tdb: Write GUID index values as version 3

Nothing reads these currently, but we should refuse to load a mixed up index
in the future

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 dc33217aea9f0f15643103dd7596b3ff3c095316..179fe671393d346f5768699efcd70133659279a0 100644 (file)
--- a/lib/ldb/ldb_tdb/ldb_index.c
+++ b/lib/ldb/ldb_tdb/ldb_index.c
@@ -49,6 +49,8 @@ struct ltdb_idxptr {
 */
 #define LTDB_INDEXING_VERSION 2
 
+#define LTDB_GUID_INDEXING_VERSION 3
+
 /* enable the idxptr mode when transactions start */
 int ltdb_index_transaction_start(struct ldb_module *module)
 {
@@ -274,10 +276,20 @@ static int ltdb_dn_list_store_full(struct ldb_module *module,
                return ldb_module_oom(module);
        }
 
-       ret = ldb_msg_add_fmt(msg, LTDB_IDXVERSION, "%u", LTDB_INDEXING_VERSION);
-       if (ret != LDB_SUCCESS) {
-               talloc_free(msg);
-               return ldb_module_oom(module);
+       if (ltdb->cache->GUID_index_attribute == NULL) {
+               ret = ldb_msg_add_fmt(msg, LTDB_IDXVERSION, "%u",
+                                     LTDB_INDEXING_VERSION);
+               if (ret != LDB_SUCCESS) {
+                       talloc_free(msg);
+                       return ldb_module_oom(module);
+               }
+       } else {
+               ret = ldb_msg_add_fmt(msg, LTDB_IDXVERSION, "%u",
+                                     LTDB_GUID_INDEXING_VERSION);
+               if (ret != LDB_SUCCESS) {
+                       talloc_free(msg);
+                       return ldb_module_oom(module);
+               }
        }
 
        msg->dn = dn;