ldbedit: prevent a transaction warning on failure

if a modify fails then cancel the transaction to prevent a dangling
transaction error

Signed-off-by: Andrew Tridgell <tridge@samba.org>
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Wed Jan 25 07:06:40 CET 2012 on sn-devel-104

diff --git a/lib/ldb/tools/ldbedit.c b/lib/ldb/tools/ldbedit.c
index aaf6d80352d804b8a652f51786799cbd38b4cc89..cf4ab3f8ec1cf459bcad268c8536a55cb2ef42c3 100644 (file)
--- a/lib/ldb/tools/ldbedit.c
+++ b/lib/ldb/tools/ldbedit.c
@@ -152,6 +152,7 @@ static int merge_edits(struct ldb_context *ldb,
                        if (ret != -1) {
                                modifies += (unsigned int) ret;
                        } else {
+                               ldb_transaction_cancel(ldb);
                                return -1;
                        }
                }