From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Sun, 21 Jul 2024 06:04:49 +0000 (+1200)
Subject: ldb:kv_index: use subtransaction_cancel in transaction_cancel
X-Git-Tag: tdb-1.4.11~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e58e4a5aa996e787fa1488347dc3121a15cb0321;p=thirdparty%2Fsamba.git

ldb:kv_index: use subtransaction_cancel in transaction_cancel

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Douglas Bagnall <dbagnall@samba.org>
Autobuild-Date(master): Sat Jul 27 23:51:44 UTC 2024 on atb-devel-224
---

diff --git a/lib/ldb/ldb_key_value/ldb_kv_index.c b/lib/ldb/ldb_key_value/ldb_kv_index.c
index 58284fd46bd..ff8c04af015 100644
--- a/lib/ldb/ldb_key_value/ldb_kv_index.c
+++ b/lib/ldb/ldb_key_value/ldb_kv_index.c
@@ -970,10 +970,7 @@ int ldb_kv_index_transaction_cancel(struct ldb_module *module)
 		tdb_close(ldb_kv->idxptr->itdb);
 	}
 	TALLOC_FREE(ldb_kv->idxptr);
-	if (ldb_kv->nested_idx_ptr && ldb_kv->nested_idx_ptr->itdb) {
-		tdb_close(ldb_kv->nested_idx_ptr->itdb);
-	}
-	TALLOC_FREE(ldb_kv->nested_idx_ptr);
+	ldb_kv_index_sub_transaction_cancel(ldb_kv);
 	return LDB_SUCCESS;
 }