diff options
| -rw-r--r-- | source4/dsdb/repl/drepl_out_helpers.c | 22 | ||||
| -rw-r--r-- | source4/dsdb/repl/replicated_objects.c | 24 | ||||
| -rw-r--r-- | source4/libnet/libnet_vampire.c | 44 | ||||
| -rw-r--r-- | source4/torture/drs/rpc/dssync.c | 18 |
4 files changed, 54 insertions, 54 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; diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c index 4bb0e92547..cb89213fcf 100644 --- a/source4/libnet/libnet_vampire.c +++ b/source4/libnet/libnet_vampire.c @@ -409,17 +409,17 @@ static NTSTATUS libnet_vampire_cb_apply_schema(struct libnet_vampire_cb_state *s s->self_made_schema = NULL; /* Now convert the schema elements again, using the schema we finalised, ready to actually import */ - status = dsdb_extended_replicated_objects_convert(s->ldb, - c->partition->nc.dn, - mapping_ctr, - object_count, - first_object, - linked_attributes_count, - linked_attributes, - s_dsa, - uptodateness_vector, - c->gensec_skey, - s, &schema_objs); + status = dsdb_replicated_objects_convert(s->ldb, + c->partition->nc.dn, + mapping_ctr, + object_count, + first_object, + linked_attributes_count, + linked_attributes, + s_dsa, + uptodateness_vector, + c->gensec_skey, + s, &schema_objs); if (!W_ERROR_IS_OK(status)) { DEBUG(0,("Failed to convert objects when trying to import over DRS (2nd pass, to store remote schema): %s\n", win_errstr(status))); return werror_to_ntstatus(status); @@ -676,17 +676,17 @@ NTSTATUS libnet_vampire_cb_store_chunk(void *private_data, } - status = dsdb_extended_replicated_objects_convert(s->ldb, - c->partition->nc.dn, - mapping_ctr, - object_count, - first_object, - linked_attributes_count, - linked_attributes, - s_dsa, - uptodateness_vector, - c->gensec_skey, - s, &objs); + status = dsdb_replicated_objects_convert(s->ldb, + c->partition->nc.dn, + mapping_ctr, + object_count, + first_object, + linked_attributes_count, + linked_attributes, + s_dsa, + uptodateness_vector, + c->gensec_skey, + s, &objs); if (!W_ERROR_IS_OK(status)) { DEBUG(0,("Failed to convert objects: %s\n", win_errstr(status))); return werror_to_ntstatus(status); diff --git a/source4/torture/drs/rpc/dssync.c b/source4/torture/drs/rpc/dssync.c index db1703d62d..9c65b91719 100644 --- a/source4/torture/drs/rpc/dssync.c +++ b/source4/torture/drs/rpc/dssync.c @@ -340,15 +340,15 @@ static bool test_analyse_objects(struct torture_context *tctx, "drs_util_dsdb_schema_load_ldb() failed"); ldap_schema = dsdb_get_schema(ldb, NULL); - status = dsdb_extended_replicated_objects_convert(ldb, - partition, - mapping_ctr, - object_count, - first_object, - 0, NULL, - NULL, NULL, - gensec_skey, - ctx, &objs); + status = dsdb_replicated_objects_convert(ldb, + partition, + mapping_ctr, + object_count, + first_object, + 0, NULL, + NULL, NULL, + gensec_skey, + ctx, &objs); torture_assert_werr_ok(tctx, status, "dsdb_extended_replicated_objects_convert() failed!"); extended_dn_ctrl = talloc(objs, struct ldb_extended_dn_control); |