summaryrefslogtreecommitdiff
path: root/source4/wrepl_server
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-10-19 16:52:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:44:58 -0500
commit47c0c176e95998db7303950fb6bf46a0e65e40d3 (patch)
tree3cb6971e617b7da5d5924ced4cdb5f28ff5f6781 /source4/wrepl_server
parentc1113796ebccf73c554d153c6c4d5b1ec16cb4bd (diff)
downloadsamba-47c0c176e95998db7303950fb6bf46a0e65e40d3.tar.gz
samba-47c0c176e95998db7303950fb6bf46a0e65e40d3.tar.bz2
samba-47c0c176e95998db7303950fb6bf46a0e65e40d3.zip
r11188: - add multi homed vs. multi homed section
metze (This used to be commit 838323e58fe4e748a17100c4cd13788059dd12c6)
Diffstat (limited to 'source4/wrepl_server')
-rw-r--r--source4/wrepl_server/wrepl_apply_records.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/source4/wrepl_server/wrepl_apply_records.c b/source4/wrepl_server/wrepl_apply_records.c
index 3d9a04369a..55b8a6e387 100644
--- a/source4/wrepl_server/wrepl_apply_records.c
+++ b/source4/wrepl_server/wrepl_apply_records.c
@@ -210,14 +210,15 @@ MHOMED,RELEASED vs. SGROUP,ACTIVE with different ip(s) => REPLACE
MHOMED,RELEASED vs. SGROUP,TOMBSTONE with different ip(s) => REPLACE
MHOMED,TOMBSTONE vs. SGROUP,ACTIVE with different ip(s) => REPLACE
MHOMED,TOMBSTONE vs. SGROUP,TOMBSTONE with different ip(s) => REPLACE
+MHOMED,ACTIVE vs. MHOMED,ACTIVE with different ip(s) => REPLACE
+MHOMED,ACTIVE vs. MHOMED,TOMBSTONE with same ip(s) => NOT REPLACE
+MHOMED,RELEASED vs. MHOMED,ACTIVE with different ip(s) => REPLACE
+MHOMED,RELEASED vs. MHOMED,TOMBSTONE with different ip(s) => REPLACE
+MHOMED,TOMBSTONE vs. MHOMED,ACTIVE with different ip(s) => REPLACE
+MHOMED,TOMBSTONE vs. MHOMED,TOMBSTONE with different ip(s) => REPLACE
*/
static enum _R_ACTION replace_replica_replica_mhomed_vs_X(struct winsdb_record *r1, struct wrepl_name *r2)
{
- if (R_IS_MHOMED(r2)) {
- /* not handled here: MERGE */
- return R_DO_MERGE;
- }
-
if (!R_IS_ACTIVE(r1)) {
/* REPLACE */
return R_DO_REPLACE;