s4:dsdb/drepl: update the source_dsa_obj/invocation_id in repsFrom
authorStefan Metzmacher <metze@samba.org>
Wed, 19 Dec 2012 16:31:28 +0000 (17:31 +0100)
committerStefan Metzmacher <metze@samba.org>
Tue, 1 Jan 2013 18:28:06 +0000 (19:28 +0100)
The highwatermark is relative to the source_dsa_invocation_id.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
source4/dsdb/repl/drepl_out_helpers.c

index 16825d4..57205a8 100644 (file)
@@ -627,6 +627,8 @@ static void dreplsrv_op_pull_source_apply_changes_trigger(struct tevent_req *req
                first_object                    = ctr1->first_object;
                linked_attributes_count         = 0;
                linked_attributes               = NULL;
+               rf1.source_dsa_obj_guid         = ctr1->source_dsa_guid;
+               rf1.source_dsa_invocation_id    = ctr1->source_dsa_invocation_id;
                rf1.highwatermark               = ctr1->new_highwatermark;
                uptodateness_vector             = NULL; /* TODO: map it */
                more_data                       = ctr1->more_data;
@@ -637,6 +639,8 @@ static void dreplsrv_op_pull_source_apply_changes_trigger(struct tevent_req *req
                first_object                    = ctr6->first_object;
                linked_attributes_count         = ctr6->linked_attributes_count;
                linked_attributes               = ctr6->linked_attributes;
+               rf1.source_dsa_obj_guid         = ctr6->source_dsa_guid;
+               rf1.source_dsa_invocation_id    = ctr6->source_dsa_invocation_id;
                rf1.highwatermark               = ctr6->new_highwatermark;
                uptodateness_vector             = ctr6->uptodateness_vector;
                more_data                       = ctr6->more_data;