From 312a04528c2f3439f0451414fee224dfa4fcb6f4 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 8 Aug 2008 11:41:21 +1000 Subject: don't leave a dangling transaction on retry error (This used to be commit ddf3022595fe8ca378c5f52107f42e296f852685) --- source3/lib/dbwrap_util.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source3') diff --git a/source3/lib/dbwrap_util.c b/source3/lib/dbwrap_util.c index 09e9071d8c..ddc613150b 100644 --- a/source3/lib/dbwrap_util.c +++ b/source3/lib/dbwrap_util.c @@ -210,7 +210,8 @@ NTSTATUS dbwrap_trans_store(struct db_context *db, TDB_DATA key, TDB_DATA dbuf, if (res != 0) { DEBUG(5, ("tdb_transaction_commit failed\n")); status = NT_STATUS_INTERNAL_DB_CORRUPTION; - goto cancel; + TALLOC_FREE(rec); + return status; } return NT_STATUS_OK; @@ -255,7 +256,8 @@ NTSTATUS dbwrap_trans_delete(struct db_context *db, TDB_DATA key) if (res != 0) { DEBUG(5, ("tdb_transaction_commit failed\n")); status = NT_STATUS_INTERNAL_DB_CORRUPTION; - goto cancel; + TALLOC_FREE(rec); + return status; } return NT_STATUS_OK; -- cgit