svn commit: samba r10995 - in branches/SAMBA_4_0/source/torture/nbt: .

[metze at samba.org]

Author: metze
Date: 2005-10-14 12:01:22 +0000 (Fri, 14 Oct 2005)
New Revision: 10995

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10995

Log:
fix released vs. released

metze
Modified:
   branches/SAMBA_4_0/source/torture/nbt/winsreplication.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/nbt/winsreplication.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbt/winsreplication.c	2005-10-14 11:18:57 UTC (rev 10994)
+++ branches/SAMBA_4_0/source/torture/nbt/winsreplication.c	2005-10-14 12:01:22 UTC (rev 10995)
@@ -1139,6 +1139,9 @@
 	/* 
 	 * 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 @@
 			.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
 		}
 	},