summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamenim@samba.org>2010-11-07 22:51:11 +0200
committerKamen Mazdrashki <kamenim@samba.org>2010-11-11 18:54:20 +0000
commit227e8dcfcfeeb5721e4f23c2bc183fd63c5bbe30 (patch)
tree229b8e8c6fefb49c04ab21e67f862d07aaf0a555
parent28f41c166a77c0d69f0b1eb3e0d811fb66e696a4 (diff)
downloadsamba-227e8dcfcfeeb5721e4f23c2bc183fd63c5bbe30.tar.gz
samba-227e8dcfcfeeb5721e4f23c2bc183fd63c5bbe30.tar.bz2
samba-227e8dcfcfeeb5721e4f23c2bc183fd63c5bbe30.zip
s4-repl: dsdb_extended_replicated_objects_commit -> dsdb_replicated_objects_commit
It is part of dsdb_replicated_* family of functions
-rw-r--r--source4/dsdb/repl/drepl_out_helpers.c6
-rw-r--r--source4/dsdb/repl/replicated_objects.c6
-rw-r--r--source4/libnet/libnet_vampire.c5
3 files changed, 8 insertions, 9 deletions
diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c
index f83cdda56d..5de8af074c 100644
--- a/source4/dsdb/repl/drepl_out_helpers.c
+++ b/source4/dsdb/repl/drepl_out_helpers.c
@@ -599,9 +599,9 @@ static void dreplsrv_op_pull_source_apply_changes_trigger(struct tevent_req *req
return;
}
- status = dsdb_extended_replicated_objects_commit(service->samdb,
- objects,
- &state->op->source_dsa->notify_uSN);
+ status = dsdb_replicated_objects_commit(service->samdb,
+ objects,
+ &state->op->source_dsa->notify_uSN);
talloc_free(objects);
if (!W_ERROR_IS_OK(status)) {
nt_status = werror_to_ntstatus(WERR_BAD_NET_RESP);
diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c
index 7f1f78c153..8cc4822c39 100644
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -286,9 +286,9 @@ WERROR dsdb_extended_replicated_objects_convert(struct ldb_context *ldb,
return WERR_OK;
}
-WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb,
- struct dsdb_extended_replicated_objects *objects,
- uint64_t *notify_uSN)
+WERROR dsdb_replicated_objects_commit(struct ldb_context *ldb,
+ struct dsdb_extended_replicated_objects *objects,
+ uint64_t *notify_uSN)
{
struct ldb_result *ext_res;
int ret;
diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index f349a5df2b..4bb0e92547 100644
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -436,7 +436,7 @@ static NTSTATUS libnet_vampire_cb_apply_schema(struct libnet_vampire_cb_state *s
}
}
- status = dsdb_extended_replicated_objects_commit(s->ldb, schema_objs, &seq_num);
+ status = dsdb_replicated_objects_commit(s->ldb, schema_objs, &seq_num);
if (!W_ERROR_IS_OK(status)) {
DEBUG(0,("Failed to commit objects: %s\n", win_errstr(status)));
return werror_to_ntstatus(status);
@@ -702,8 +702,7 @@ NTSTATUS libnet_vampire_cb_store_chunk(void *private_data,
NDR_PRINT_DEBUG(replPropertyMetaDataBlob, objs->objects[i].meta_data);
}
}
- status = dsdb_extended_replicated_objects_commit(s->ldb,
- objs, &seq_num);
+ status = dsdb_replicated_objects_commit(s->ldb, objs, &seq_num);
if (!W_ERROR_IS_OK(status)) {
DEBUG(0,("Failed to commit objects: %s\n", win_errstr(status)));
return werror_to_ntstatus(status);