From 0b0c38d899db75e6954af2618e7f063dbfc09fd6 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 14 Oct 2005 12:01:22 +0000
Subject: r10995: fix released vs. released

metze
(This used to be commit 573c2df2badbba12fb4d909e7ad4edf6678c7851)
---
 source4/torture/nbt/winsreplication.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index 56f7588ac2..dec1a21ca3 100644
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -1139,6 +1139,9 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
 	/* 
 	 * unique,released vs. group,released
 	 * => should be replaced
+	 *
+	 * here we need a 2nd round to make sure
+	 * released vs. released is handled correct
 	 */
 	{
 		.line	= __location__,
@@ -1164,32 +1167,27 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
 			.apply_expected	= True
 		}
 	},
-
-	/* 
-	 * unique,released vs. group,released
-	 * => should be replaced
-	 */
 	{
 		.line	= __location__,
 		.name	= _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
 		.r1	= {
-			.owner		= &ctx->a,
+			.owner		= &ctx->b,
 			.type		= WREPL_TYPE_UNIQUE,
-			.state		= WREPL_STATE_RELEASED,
+			.state		= WREPL_STATE_TOMBSTONE,
 			.node		= WREPL_NODE_B,
 			.is_static	= False,
 			.num_ips	= ARRAY_SIZE(addresses_A_1),
 			.ips		= addresses_A_1,
-			.apply_expected	= False
+			.apply_expected	= False /* this should conflict with the group.released above */
 		},
 		.r2	= {
-			.owner		= &ctx->b,
+			.owner		= &ctx->a,
 			.type		= WREPL_TYPE_GROUP,
 			.state		= WREPL_STATE_TOMBSTONE,
 			.node		= WREPL_NODE_B,
 			.is_static	= False,
-			.num_ips	= ARRAY_SIZE(addresses_B_1),
-			.ips		= addresses_B_1,
+			.num_ips	= ARRAY_SIZE(addresses_A_1),
+			.ips		= addresses_A_1,
 			.apply_expected	= True
 		}
 	},
-- 
cgit