sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-24 02:04:21 +03:00
Code

r10995: fix released vs. released

Browse Source 
metze
(This used to be commit 573c2df2badbba12fb4d909e7ad4edf6678c7851)
This commit is contained in:
Stefan Metzmacher 2005-10-14 12:01:22 +00:00 committed by Gerald (Jerry) Carter
parent 00ef27d754
commit 0b0c38d899
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source4/torture/nbt/winsreplication.c
View File

@ -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
}
},