[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-90-g3942e53

Simo Sorce idra at samba.org
Thu Jan 22 16:56:23 GMT 2009


The branch, master has been updated
       via  3942e53357146c9c5419313efc4c91b85f7e508b (commit)
      from  031f24694197ab2c90418c5a5285a2932b71e998 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3942e53357146c9c5419313efc4c91b85f7e508b
Author: Simo Sorce <idra at samba.org>
Date:   Thu Jan 22 11:51:37 2009 -0500

    Do not start a transaction this way.
    Because we still want to commit any changes that successfully apply we
    never want to do a global cancel, and because of how transaction nesting
    works that means we never cancel any "transaction" at the single modify
    operation level.
    
    Let each operation start its own transaction so that the transaction is
    properly canceled if any error is returned and half committed operations
    (though plugins failing) are properly reverted on a per operation basis.

-----------------------------------------------------------------------

Summary of changes:
 source4/lib/ldb/tools/ldbmodify.c |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/tools/ldbmodify.c b/source4/lib/ldb/tools/ldbmodify.c
index d73937c..6e355a1 100644
--- a/source4/lib/ldb/tools/ldbmodify.c
+++ b/source4/lib/ldb/tools/ldbmodify.c
@@ -93,11 +93,6 @@ 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 {
@@ -113,11 +108,6 @@ 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);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list