[SCM] Samba Shared Repository - branch master updated

[Kamen Mazdrashki]

The branch, master has been updated
       via  cce6627 s4-schema_load: Don't clean in_transaction flag until transaction is really finished
      from  0f29042 s4:subtree_rename LDB module - make use of "dsdb_find_nc_root"

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


- Log -----------------------------------------------------------------
commit cce662763efc2843c3dffeb1d43c12e641ce9949
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Thu Nov 11 23:25:35 2010 +0200

    s4-schema_load: Don't clean in_transaction flag until transaction is really finished
    
    Autobuild-User: Kamen Mazdrashki <kamenim at samba.org>
    Autobuild-Date: Tue Nov 16 11:00:35 UTC 2010 on sn-devel-104

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

Summary of changes:
 source4/dsdb/samdb/ldb_modules/schema_load.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/schema_load.c b/source4/dsdb/samdb/ldb_modules/schema_load.c
index 086b2bf..ddc3b3f 100644
--- a/source4/dsdb/samdb/ldb_modules/schema_load.c
+++ b/source4/dsdb/samdb/ldb_modules/schema_load.c
@@ -318,25 +318,24 @@ static int schema_load_start_transaction(struct ldb_module *module)
 	return ldb_next_start_trans(module);
 }
 
-static int schema_load_del_transaction(struct ldb_module *module)
+static int schema_load_end_transaction(struct ldb_module *module)
 {
 	struct schema_load_private_data *private_data =
 		talloc_get_type(ldb_module_get_private(module), struct schema_load_private_data);
 
 	private_data->in_transaction = false;
 
-	return ldb_next_del_trans(module);
+	return ldb_next_end_trans(module);
 }
 
-static int schema_load_prepare_commit(struct ldb_module *module)
+static int schema_load_del_transaction(struct ldb_module *module)
 {
-	int ret;
 	struct schema_load_private_data *private_data =
 		talloc_get_type(ldb_module_get_private(module), struct schema_load_private_data);
 
-	ret = ldb_next_prepare_commit(module);
 	private_data->in_transaction = false;
-	return ret;
+
+	return ldb_next_del_trans(module);
 }
 
 static int schema_load_extended(struct ldb_module *module, struct ldb_request *req)
@@ -359,7 +358,7 @@ static const struct ldb_module_ops ldb_schema_load_module_ops = {
 	.init_context	= schema_load_init,
 	.extended	= schema_load_extended,
 	.start_transaction = schema_load_start_transaction,
-	.prepare_commit    = schema_load_prepare_commit,
+	.end_transaction   = schema_load_end_transaction,
 	.del_transaction   = schema_load_del_transaction,
 };
 


-- 
Samba Shared Repository