svn commit: samba r10996 - in branches/tmp/samba4-winsrepl: . source/torture/nbt

[metze at samba.org]

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

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

Log:
 r13814 at SERNOX (orig r10995):  metze | 2005-10-14 14:01:22 +0200
 fix released vs. released
 
 metze

Modified:
   branches/tmp/samba4-winsrepl/
   branches/tmp/samba4-winsrepl/source/torture/nbt/winsreplication.c


Changeset:

Property changes on: branches/tmp/samba4-winsrepl
___________________________________________________________________
Name: svk:merge
   - 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10993
3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495
a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11632
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5616
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5609
   + 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10995
3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495
a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11632
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5616
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5609

Modified: branches/tmp/samba4-winsrepl/source/torture/nbt/winsreplication.c
===================================================================
--- branches/tmp/samba4-winsrepl/source/torture/nbt/winsreplication.c	2005-10-14 12:01:22 UTC (rev 10995)
+++ branches/tmp/samba4-winsrepl/source/torture/nbt/winsreplication.c	2005-10-14 12:01:43 UTC (rev 10996)
@@ -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
 		}
 	},