summaryrefslogtreecommitdiff
path: root/source4/dsdb/repl
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-01-12 16:02:10 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:40:29 -0500
commit18f81804696c0916652acc1f9491e96fda0d25fc (patch)
treec9a5783413ce8961f14b23ead21c05e58d26febf /source4/dsdb/repl
parentfaf57b1dc5a451109d4b2b64965d87ee3c6c04eb (diff)
downloadsamba-18f81804696c0916652acc1f9491e96fda0d25fc.tar.gz
samba-18f81804696c0916652acc1f9491e96fda0d25fc.tar.bz2
samba-18f81804696c0916652acc1f9491e96fda0d25fc.zip
r20709: pass a repsFromTo1 struct down as it contains all needed info for the source dsa
and the highwater mark vector metze (This used to be commit a31e017e5388e5abd6ed9d09adcf26d2527954a6)
Diffstat (limited to 'source4/dsdb/repl')
-rw-r--r--source4/dsdb/repl/replicated_objects.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c
index da3f6d0461..1e032b4c80 100644
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -183,8 +183,7 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb,
const struct drsuapi_DsReplicaObjectListItemEx *first_object,
uint32_t linked_attributes_count,
const struct drsuapi_DsReplicaLinkedAttribute *linked_attributes,
- const struct GUID *source_dsa_invocation_id,
- const struct drsuapi_DsReplicaHighWaterMark *new_highwatermark,
+ const struct repsFromTo1 *source_dsa,
const struct drsuapi_DsReplicaCursor2CtrEx *uptodateness_vector,
TALLOC_CTX *mem_ctx,
struct dsdb_extended_replicated_objects **_out)
@@ -205,9 +204,8 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb,
out->partition_dn = ldb_dn_new(out, ldb, partition_dn);
W_ERROR_HAVE_NO_MEMORY(out->partition_dn);
- out->source_dsa_invocation_id = source_dsa_invocation_id;
- out->new_highwatermark = new_highwatermark;
- out->uptodateness_vector = uptodateness_vector;
+ out->source_dsa = source_dsa;
+ out->uptodateness_vector= uptodateness_vector;
out->num_objects = object_count;
out->objects = talloc_array(out,