summaryrefslogtreecommitdiff
path: root/source4/dsdb/repl
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamenim@samba.org>2010-11-07 23:04:33 +0200
committerKamen Mazdrashki <kamenim@samba.org>2010-11-11 18:54:20 +0000
commita8495d380ef93f8d236d521c8b1b8bf76f689acf (patch)
tree765af02dc4d65b093796e86b42ddfecaa5d0d3dd /source4/dsdb/repl
parent227e8dcfcfeeb5721e4f23c2bc183fd63c5bbe30 (diff)
downloadsamba-a8495d380ef93f8d236d521c8b1b8bf76f689acf.tar.gz
samba-a8495d380ef93f8d236d521c8b1b8bf76f689acf.tar.bz2
samba-a8495d380ef93f8d236d521c8b1b8bf76f689acf.zip
s4-repl: dsdb_extended_replicated_objects_convert -> dsdb_replicated_objects_convert/
It is part of dsdb_replicated_* family of functions
Diffstat (limited to 'source4/dsdb/repl')
-rw-r--r--source4/dsdb/repl/drepl_out_helpers.c22
-rw-r--r--source4/dsdb/repl/replicated_objects.c24
2 files changed, 23 insertions, 23 deletions
diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c
index 5de8af074c..b99f1267fe 100644
--- a/source4/dsdb/repl/drepl_out_helpers.c
+++ b/source4/dsdb/repl/drepl_out_helpers.c
@@ -580,17 +580,17 @@ static void dreplsrv_op_pull_source_apply_changes_trigger(struct tevent_req *req
return;
}
- status = dsdb_extended_replicated_objects_convert(service->samdb,
- partition->nc.dn,
- mapping_ctr,
- object_count,
- first_object,
- linked_attributes_count,
- linked_attributes,
- &rf1,
- uptodateness_vector,
- &drsuapi->gensec_skey,
- state, &objects);
+ status = dsdb_replicated_objects_convert(service->samdb,
+ partition->nc.dn,
+ mapping_ctr,
+ object_count,
+ first_object,
+ linked_attributes_count,
+ linked_attributes,
+ &rf1,
+ uptodateness_vector,
+ &drsuapi->gensec_skey,
+ state, &objects);
if (!W_ERROR_IS_OK(status)) {
nt_status = werror_to_ntstatus(WERR_BAD_NET_RESP);
DEBUG(0,("Failed to convert objects: %s/%s\n",
diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c
index 8cc4822c39..5e18277629 100644
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -196,18 +196,18 @@ WERROR dsdb_convert_object_ex(struct ldb_context *ldb,
return WERR_OK;
}
-WERROR dsdb_extended_replicated_objects_convert(struct ldb_context *ldb,
- const char *partition_dn_str,
- const struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr,
- uint32_t object_count,
- const struct drsuapi_DsReplicaObjectListItemEx *first_object,
- uint32_t linked_attributes_count,
- const struct drsuapi_DsReplicaLinkedAttribute *linked_attributes,
- const struct repsFromTo1 *source_dsa,
- const struct drsuapi_DsReplicaCursor2CtrEx *uptodateness_vector,
- const DATA_BLOB *gensec_skey,
- TALLOC_CTX *mem_ctx,
- struct dsdb_extended_replicated_objects **objects)
+WERROR dsdb_replicated_objects_convert(struct ldb_context *ldb,
+ const char *partition_dn_str,
+ const struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr,
+ uint32_t object_count,
+ const struct drsuapi_DsReplicaObjectListItemEx *first_object,
+ uint32_t linked_attributes_count,
+ const struct drsuapi_DsReplicaLinkedAttribute *linked_attributes,
+ const struct repsFromTo1 *source_dsa,
+ const struct drsuapi_DsReplicaCursor2CtrEx *uptodateness_vector,
+ const DATA_BLOB *gensec_skey,
+ TALLOC_CTX *mem_ctx,
+ struct dsdb_extended_replicated_objects **objects)
{
WERROR status;
struct ldb_dn *partition_dn;