From f0e44c35afce5ceec5d247dbd4205301251e403c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 16 Jul 2008 13:01:56 +0200 Subject: drsuapi: make use of the 'more_data' field in DsGetNCChangesCtr[1|6] metze (This used to be commit 35c7fa470a7433d081403b2b57a331c7dc287aef) --- source4/dsdb/repl/drepl_out_helpers.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'source4/dsdb') diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c index 694d89dfe3..281e5691e2 100644 --- a/source4/dsdb/repl/drepl_out_helpers.c +++ b/source4/dsdb/repl/drepl_out_helpers.c @@ -365,6 +365,7 @@ static void dreplsrv_op_pull_source_apply_changes_send(struct dreplsrv_op_pull_s linked_attributes = NULL; rf1.highwatermark = ctr1->new_highwatermark; uptodateness_vector = NULL; /* TODO: map it */ + more_data = ctr1->more_data; break; case 6: mapping_ctr = &ctr6->mapping_ctr; @@ -374,6 +375,7 @@ static void dreplsrv_op_pull_source_apply_changes_send(struct dreplsrv_op_pull_s linked_attributes = ctr6->linked_attributes; rf1.highwatermark = ctr6->new_highwatermark; uptodateness_vector = ctr6->uptodateness_vector; + more_data = ctr6->more_data; break; default: composite_error(c, werror_to_ntstatus(WERR_BAD_NET_RESP)); @@ -404,14 +406,6 @@ static void dreplsrv_op_pull_source_apply_changes_send(struct dreplsrv_op_pull_s * TODO: update our uptodatevector! */ - /* - * if the tmp_highest_usn is higher than highest_usn - * there's more to pull from this source_dsa - */ - if (rf1.highwatermark.tmp_highest_usn > rf1.highwatermark.highest_usn) { - more_data = true; - } - if (more_data) { dreplsrv_op_pull_source_get_changes_send(st); return; -- cgit