sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

s4-repl: dsdb_extended_replicated_objects_convert -> dsdb_replicated_objects_convert/

Browse Source 
It is part of dsdb_replicated_* family of functions
This commit is contained in:
Kamen Mazdrashki 2010-11-07 23:04:33 +02:00
parent 227e8dcfcf
commit a8495d380e
4 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source4/dsdb/repl/drepl_out_helpers.c
View File

@ -580,17 +580,17 @@ static void dreplsrv_op_pull_source_apply_changes_trigger(struct tevent_req *req
return; return;
} }
status = dsdb_extended_replicated_objects_convert(service->samdb, status = dsdb_replicated_objects_convert(service->samdb,
partition->nc.dn, partition->nc.dn,
mapping_ctr, mapping_ctr,
object_count, object_count,
first_object, first_object,
linked_attributes_count, linked_attributes_count,
linked_attributes, linked_attributes,
&rf1, &rf1,
uptodateness_vector, uptodateness_vector,
&drsuapi->gensec_skey, &drsuapi->gensec_skey,
state, &objects); state, &objects);
if (!W_ERROR_IS_OK(status)) { if (!W_ERROR_IS_OK(status)) {
nt_status = werror_to_ntstatus(WERR_BAD_NET_RESP); nt_status = werror_to_ntstatus(WERR_BAD_NET_RESP);
DEBUG(0,("Failed to convert objects: %s/%s\n", DEBUG(0,("Failed to convert objects: %s/%s\n",

24
source4/dsdb/repl/replicated_objects.c
View File

@ -196,18 +196,18 @@ WERROR dsdb_convert_object_ex(struct ldb_context *ldb,
return WERR_OK; return WERR_OK;
} }
WERROR dsdb_extended_replicated_objects_convert(struct ldb_context *ldb, WERROR dsdb_replicated_objects_convert(struct ldb_context *ldb,
const char *partition_dn_str, const char *partition_dn_str,
const struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr, const struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr,
uint32_t object_count, uint32_t object_count,
const struct drsuapi_DsReplicaObjectListItemEx *first_object, const struct drsuapi_DsReplicaObjectListItemEx *first_object,
uint32_t linked_attributes_count, uint32_t linked_attributes_count,
const struct drsuapi_DsReplicaLinkedAttribute *linked_attributes, const struct drsuapi_DsReplicaLinkedAttribute *linked_attributes,
const struct repsFromTo1 *source_dsa, const struct repsFromTo1 *source_dsa,
const struct drsuapi_DsReplicaCursor2CtrEx *uptodateness_vector, const struct drsuapi_DsReplicaCursor2CtrEx *uptodateness_vector,
const DATA_BLOB *gensec_skey, const DATA_BLOB *gensec_skey,
TALLOC_CTX *mem_ctx, TALLOC_CTX *mem_ctx,
struct dsdb_extended_replicated_objects **objects) struct dsdb_extended_replicated_objects **objects)
{ {
WERROR status; WERROR status;
struct ldb_dn *partition_dn; struct ldb_dn *partition_dn;

44
source4/libnet/libnet_vampire.c
View File

@ -409,17 +409,17 @@ static NTSTATUS libnet_vampire_cb_apply_schema(struct libnet_vampire_cb_state *s
s->self_made_schema = NULL; s->self_made_schema = NULL;
/* Now convert the schema elements again, using the schema we finalised, ready to actually import */ /* Now convert the schema elements again, using the schema we finalised, ready to actually import */
status = dsdb_extended_replicated_objects_convert(s->ldb, status = dsdb_replicated_objects_convert(s->ldb,
c->partition->nc.dn, c->partition->nc.dn,
mapping_ctr, mapping_ctr,
object_count, object_count,
first_object, first_object,
linked_attributes_count, linked_attributes_count,
linked_attributes, linked_attributes,
s_dsa, s_dsa,
uptodateness_vector, uptodateness_vector,
c->gensec_skey, c->gensec_skey,
s, &schema_objs); s, &schema_objs);
if (!W_ERROR_IS_OK(status)) { 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))); 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); 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, status = dsdb_replicated_objects_convert(s->ldb,
c->partition->nc.dn, c->partition->nc.dn,
mapping_ctr, mapping_ctr,
object_count, object_count,
first_object, first_object,
linked_attributes_count, linked_attributes_count,
linked_attributes, linked_attributes,
s_dsa, s_dsa,
uptodateness_vector, uptodateness_vector,
c->gensec_skey, c->gensec_skey,
s, &objs); s, &objs);
if (!W_ERROR_IS_OK(status)) { if (!W_ERROR_IS_OK(status)) {
DEBUG(0,("Failed to convert objects: %s\n", win_errstr(status))); DEBUG(0,("Failed to convert objects: %s\n", win_errstr(status)));
return werror_to_ntstatus(status); return werror_to_ntstatus(status);

18
source4/torture/drs/rpc/dssync.c
View File

@ -340,15 +340,15 @@ static bool test_analyse_objects(struct torture_context *tctx,
"drs_util_dsdb_schema_load_ldb() failed"); "drs_util_dsdb_schema_load_ldb() failed");
ldap_schema = dsdb_get_schema(ldb, NULL); ldap_schema = dsdb_get_schema(ldb, NULL);
status = dsdb_extended_replicated_objects_convert(ldb, status = dsdb_replicated_objects_convert(ldb,
partition, partition,
mapping_ctr, mapping_ctr,
object_count, object_count,
first_object, first_object,
0, NULL, 0, NULL,
NULL, NULL, NULL, NULL,
gensec_skey, gensec_skey,
ctx, &objs); ctx, &objs);
torture_assert_werr_ok(tctx, status, "dsdb_extended_replicated_objects_convert() failed!"); torture_assert_werr_ok(tctx, status, "dsdb_extended_replicated_objects_convert() failed!");
extended_dn_ctrl = talloc(objs, struct ldb_extended_dn_control); extended_dn_ctrl = talloc(objs, struct ldb_extended_dn_control);