summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamenim@samba.org>2010-11-11 23:25:35 +0200
committerKamen Mazdrashki <kamenim@samba.org>2010-11-16 11:00:35 +0000
commitcce662763efc2843c3dffeb1d43c12e641ce9949 (patch)
tree3a7333696c42a34c51b1ad96168d420610af99ad
parent0f2904247ba7f888023bd4ab4e2e42d565d7e840 (diff)
downloadsamba-cce662763efc2843c3dffeb1d43c12e641ce9949.tar.gz
samba-cce662763efc2843c3dffeb1d43c12e641ce9949.tar.bz2
samba-cce662763efc2843c3dffeb1d43c12e641ce9949.zip
s4-schema_load: Don't clean in_transaction flag until transaction is really finished
Autobuild-User: Kamen Mazdrashki <kamenim@samba.org> Autobuild-Date: Tue Nov 16 11:00:35 UTC 2010 on sn-devel-104
-rw-r--r--source4/dsdb/samdb/ldb_modules/schema_load.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/schema_load.c b/source4/dsdb/samdb/ldb_modules/schema_load.c
index 086b2bfa40..ddc3b3f0c9 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,
};