svn commit: samba r12072 - in branches/SAMBA_4_0/source/wrepl_server: .

[metze at samba.org]

Author: metze
Date: 2005-12-05 12:47:32 +0000 (Mon, 05 Dec 2005)
New Revision: 12072

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

Log:
fix sgroup,active,owned vs. sgroup,non-active case

metze
Modified:
   branches/SAMBA_4_0/source/wrepl_server/wrepl_apply_records.c


Changeset:
Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_apply_records.c
===================================================================
--- branches/SAMBA_4_0/source/wrepl_server/wrepl_apply_records.c	2005-12-05 12:25:19 UTC (rev 12071)
+++ branches/SAMBA_4_0/source/wrepl_server/wrepl_apply_records.c	2005-12-05 12:47:32 UTC (rev 12072)
@@ -500,6 +500,16 @@
 _SA_MT_SI_U<1c> => NOT REPLACE
 _SA_MT_DI_U<1c> => NOT REPLACE
 
+Test Replica vs. owned active: SGROUP vs. SGROUP tests
+_SA_SA_DI_U<1c> => SGROUP_MERGE
+_SA_SA_SI_U<1c> => SGROUP_MERGE
+_SA_SA_SP_U<1c> => SGROUP_MERGE
+_SA_SA_SB_U<1c> => SGROUP_MERGE
+_SA_ST_DI_U<1c> => NOT REPLACE
+_SA_ST_SI_U<1c> => NOT REPLACE
+_SA_ST_SP_U<1c> => NOT REPLACE
+_SA_ST_SB_U<1c> => NOT REPLACE
+
 SGROUP,ACTIVE vs. SGROUP,* is not handled here!
 
 released:
@@ -527,13 +537,18 @@
 		return R_DO_REPLACE;
 	}
 
-	if (R_IS_SGROUP(r2)) {
-		/* not handled here: MERGE */
-		return R_DO_SGROUP_MERGE;
+	if (!R_IS_SGROUP(r2) || !R_IS_ACTIVE(r2)) {
+		/* NOT REPLACE */
+		return R_NOT_REPLACE;
 	}
 
-	/* NOT REPLACE */
-	return R_NOT_REPLACE;
+	/*
+	 * TODO: should we have the same logic here like in 
+	 *       replace_sgroup_replica_vs_X_replica() ?
+	 */
+
+	/* not handled here: MERGE */
+	return R_DO_SGROUP_MERGE;
 }
 
 /*