ITS#5600

CHANGES

@@ -14,6 +14,7 @@ OpenLDAP 2.4.11 Engineering
 	Fixed slapd sets memory leak (ITS#5557)
 	Fixed slapd sortvals binary search (ITS#5578)
 	Fixed slapd syncrepl updates with multiple masters (ITS#5597)
+	Fixed slapd syncrepl superior objectClass delete/add (ITS#5600)
 	Fixed slapd syncrepl/slapo-syncprov contextCSN updates as internal ops (ITS#5596)
 	Added slapd-ldap/slapd-meta option to filter out search references (ITS#5593)
 	Fixed slapd-meta link to slapd-ldap (ITS#5355)

servers/slapd/syncrepl.c

@@ -2883,6 +2883,14 @@ attr_cmp( Operation *op, Attribute *old, Attribute *new,
 			}
 		}
 
+		/* Don't delete/add an objectClass, always use the replace op.
+		 * Modify would fail if provider has replaced entry with a new,
+		 * and the new explicitly includes a superior of a class that was
+		 * only included implicitly in the old entry.  Ref ITS#5517.
+		 */
+		if ( nn && no < o && old->a_desc == slap_schema.si_ad_objectClass )
+			no = o;
+
 		i = j;
 		/* all old values were deleted, just use the replace op */
 		if ( no == o ) {