From bfd0877261883d1d6ef1d1757dad386332a8db37 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 15 Sep 2009 14:06:07 -0700 Subject: s4-repl: don't do double replication When we replicate from a remote DC, we need to note the new uSN that the local changes have resulted in, and modify the uSN that the notify task uses to determine if it should send a ReplicaSync message back to the remote DC. Otherwise we end up always triggering a ReplicaSync every time we replicate from another DC --- source4/torture/libnet/libnet_BecomeDC.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source4/torture/libnet') diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c index 7d1c025f18..81bdf342b2 100644 --- a/source4/torture/libnet/libnet_BecomeDC.c +++ b/source4/torture/libnet/libnet_BecomeDC.c @@ -140,6 +140,7 @@ static NTSTATUS test_apply_schema(struct test_become_dc_state *s, uint32_t i; int ret; bool ok; + uint64_t seq_num; DEBUG(0,("Analyze and apply schema objects\n")); @@ -273,7 +274,7 @@ static NTSTATUS test_apply_schema(struct test_become_dc_state *s, s_dsa, uptodateness_vector, c->gensec_skey, - s, &objs); + s, &objs, &seq_num); if (!W_ERROR_IS_OK(status)) { DEBUG(0,("Failed to commit objects: %s\n", win_errstr(status))); return werror_to_ntstatus(status); @@ -447,6 +448,7 @@ static NTSTATUS test_become_dc_store_chunk(void *private_data, struct repsFromTo1 *s_dsa; char *tmp_dns_name; uint32_t i; + uint64_t seq_num; s_dsa = talloc_zero(s, struct repsFromTo1); NT_STATUS_HAVE_NO_MEMORY(s_dsa); @@ -514,7 +516,7 @@ static NTSTATUS test_become_dc_store_chunk(void *private_data, s_dsa, uptodateness_vector, c->gensec_skey, - s, &objs); + s, &objs, &seq_num); if (!W_ERROR_IS_OK(status)) { DEBUG(0,("Failed to commit objects: %s\n", win_errstr(status))); return werror_to_ntstatus(status); -- cgit