The branch, master has been updated
via 34e7d96 ldbedit: prevent a transaction warning on failure
from ab5cdb3 Revert "s3:build: for now do not require
gsskrb5_extract_authz_data_from_sec_context"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 34e7d960d0065a51b5524630a6699834c9b362b1
Author: Kelly Yeoh <[email protected]>
Date: Wed Jan 25 14:58:44 2012 +1100
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 <[email protected]>
Autobuild-User: Andrew Tridgell <[email protected]>
Autobuild-Date: Wed Jan 25 07:06:40 CET 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
lib/ldb/tools/ldbedit.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/tools/ldbedit.c b/lib/ldb/tools/ldbedit.c
index aaf6d80..cf4ab3f 100644
--- 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;
}
}
--
Samba Shared Repository
