From: Pierangelo Masarati <ando@openldap.org>
Date: Sun, 22 Feb 2009 23:32:00 +0000 (+0000)
Subject: fix objectClass inheritance deletion (ITS#5517, ITS#5963)
X-Git-Tag: ACLCHECK_0~792
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e1fbf8b1258bb9611b2df0df2ff0b8daeeabe898;p=openldap

fix objectClass inheritance deletion (ITS#5517, ITS#5963)
---

diff --git a/servers/slapd/mods.c b/servers/slapd/mods.c
index 1ad15f8906..c8d8b9c9e2 100644
--- a/servers/slapd/mods.c
+++ b/servers/slapd/mods.c
@@ -263,13 +263,18 @@ modify_delete_vindex(
 		goto return_result;
 	}
 
+	if ( a->a_desc == slap_schema.si_ad_objectClass ) {
+		/* Needed by ITS#5517,ITS#5963 */
+		flags = SLAP_MR_EQUALITY | SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX;
+
+	} else {
+		flags = SLAP_MR_EQUALITY | SLAP_MR_VALUE_OF_ASSERTION_SYNTAX;
+	}
 	if ( mod->sm_nvalues ) {
-		flags = SLAP_MR_EQUALITY | SLAP_MR_VALUE_OF_ASSERTION_SYNTAX
-			| SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH
+		flags |= SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH
 			| SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH;
 		cvals = mod->sm_nvalues;
 	} else {
-		flags = SLAP_MR_EQUALITY | SLAP_MR_VALUE_OF_ASSERTION_SYNTAX;
 		cvals = mod->sm_values;
 	}