Author: metze Date: 2005-10-19 17:48:55 +0000 (Wed, 19 Oct 2005) New Revision: 11189
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11189 Log: add some more special group vs. special group tests, to make sure that replicas from the same owner are blinding overwritten in all cases metze Modified: branches/SAMBA_4_0/source/torture/nbt/winsreplication.c branches/SAMBA_4_0/source/wrepl_server/wrepl_apply_records.c Changeset: Modified: branches/SAMBA_4_0/source/torture/nbt/winsreplication.c =================================================================== --- branches/SAMBA_4_0/source/torture/nbt/winsreplication.c 2005-10-19 16:52:50 UTC (rev 11188) +++ branches/SAMBA_4_0/source/torture/nbt/winsreplication.c 2005-10-19 17:48:55 UTC (rev 11189) @@ -676,6 +676,20 @@ .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, Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_apply_records.c =================================================================== --- branches/SAMBA_4_0/source/wrepl_server/wrepl_apply_records.c 2005-10-19 16:52:50 UTC (rev 11188) +++ branches/SAMBA_4_0/source/wrepl_server/wrepl_apply_records.c 2005-10-19 17:48:55 UTC (rev 11189) @@ -63,10 +63,9 @@ #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; }
