Rebase ldb code with all changes in samba master

1 files changed, 10 insertions, 0 deletions

diff --git a/ldb/tools/ldbmodify.c b/ldb/tools/ldbmodify.c
index 6e355a10..d73937ce 100644
--- a/ldb/tools/ldbmodify.c
+++ b/ldb/tools/ldbmodify.c
@@ -93,6 +93,11 @@ int main(int argc, const char **argv)
 
 	options = ldb_cmdline_process(ldb, argc, argv, usage);
 
+	if (ldb_transaction_start(ldb) != 0) {
+		printf("Failed to start transaction: %s\n", ldb_errstring(ldb));
+		exit(1);
+	}
+
 	if (options->argc == 0) {
 		ret = process_file(ldb, stdin, &count);
 	} else {
@@ -108,6 +113,11 @@ int main(int argc, const char **argv)
 		}
 	}
 
+	if (count != 0 && ldb_transaction_commit(ldb) != 0) {
+		printf("Failed to commit transaction: %s\n", ldb_errstring(ldb));
+		exit(1);
+	}
+
 	talloc_free(ldb);
 
 	printf("Modified %d records with %d failures\n", count, failures);