sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

r11189: add some more special group vs. special group tests,

Browse Source 
to make sure that replicas from the same owner are blinding overwritten
in all cases

metze
(This used to be commit 466baf737a)
This commit is contained in:
Stefan Metzmacher 2005-10-19 17:48:55 +00:00 committed by Gerald (Jerry) Carter
parent 47c0c176e9
commit bc43d1b6f0
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -676,6 +676,20 @@ static BOOL test_conflict_same_owner(struct test_wrepl_conflict_conn *ctx)
.num_ips = ARRAY_SIZE(addresses_A_1),
.ips = addresses_A_1,
},{
.type = WREPL_TYPE_SGROUP,
.state = WREPL_STATE_ACTIVE,
.node = WREPL_NODE_B,
.is_static = False,
.num_ips = ARRAY_SIZE(addresses_A_3_4),
.ips = addresses_A_3_4,
},{
.type = WREPL_TYPE_SGROUP,
.state = WREPL_STATE_TOMBSTONE,
.node = WREPL_NODE_B,
.is_static = False,
.num_ips = ARRAY_SIZE(addresses_B_3_4),
.ips = addresses_B_3_4,
},{
/* the last one should always be a unique,tomstone record! */
.type = WREPL_TYPE_UNIQUE,
.state = WREPL_STATE_TOMBSTONE,

3
source4/wrepl_server/wrepl_apply_records.c
View File

@ -63,10 +63,9 @@ static const char *_R_ACTION_enum_string(enum _R_ACTION action)
#define R_IS_SGROUP(r) ((r)->type == WREPL_TYPE_SGROUP)
#define R_IS_MHOMED(r) ((r)->type == WREPL_TYPE_MHOMED)
/* blindly overwrite records from the same owner in all cases */
static enum _R_ACTION replace_same_owner(struct winsdb_record *r1, struct wrepl_name *r2)
{
/* TODO: we need to look closer at how special groups are handled */
/* REPLACE */
return R_DO_REPLACE;
}