X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschema_prep.c;h=7c145bf148ab728f7c46855cba01436d9a9969d4;hb=ca9bb44089145bdb7435135714590d48f4a6eabd;hp=d758e1cebbba4494768df674c343b31a4b446a3f;hpb=c37a3b37b80ce3a5ba273a9db97dfb981411b685;p=openldap

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index d758e1cebb..7c145bf148 100644
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -28,14 +28,15 @@ static int objectClassNormalize(
 	struct slap_syntax *syntax, /* NULL if in is asserted value */
 	struct slap_matching_rule *mr,
 	struct berval * in,
-	struct berval * out )
+	struct berval * out,
+	void *ctx )
 {
 	ObjectClass *oc = oc_bvfind( in );
 
 	if( oc != NULL ) {
-		ber_dupbv( out, &oc->soc_cname );
+		ber_dupbv_x( out, &oc->soc_cname, ctx );
 	} else {
-		ber_dupbv( out, in );
+		ber_dupbv_x( out, in, ctx );
 	}
 
 #if OCDEBUG
@@ -90,11 +91,7 @@ objectSubClassMatch(
 		return SLAPD_COMPARE_UNDEFINED;
 	}
 
-#ifdef SLAP_NVALUES
 	if( SLAP_MR_IS_VALUE_OF_ATTRIBUTE_SYNTAX( flags ) )
-#else
-	if( SLAP_IS_MR_ATTRIBUTE_SYNTAX_MATCH( flags ) )
-#endif
 	{
 		*matchp = ( asserted != oc );
 	} else {
@@ -122,7 +119,8 @@ static int objectSubClassIndexer(
 	struct slap_matching_rule *mr,
 	struct berval *prefix,
 	BerVarray values,
-	BerVarray *keysp )
+	BerVarray *keysp,
+	void *ctx )
 {
 	int rc, noc, i;
 	BerVarray ocvalues;
@@ -132,7 +130,7 @@ static int objectSubClassIndexer(
 	}
 
 	/* over allocate */
-	ocvalues = ch_malloc( sizeof( struct berval ) * (noc+16) );
+	ocvalues = sl_malloc( sizeof( struct berval ) * (noc+16), ctx );
 
 	/* copy listed values (and termination) */
 	for( i=0; i<noc; i++ ) {
@@ -189,8 +187,8 @@ static int objectSubClassIndexer(
 			}
 
 			if( !found ) {
-				ocvalues = ch_realloc( ocvalues,
-					sizeof( struct berval ) * (noc+2) );
+				ocvalues = sl_realloc( ocvalues,
+					sizeof( struct berval ) * (noc+2), ctx );
 
 				assert( k == noc );
 
@@ -230,9 +228,9 @@ static int objectSubClassIndexer(
 #endif
 
 	rc = octetStringIndexer( use, mask, syntax, mr,
-		prefix, ocvalues, keysp );
+		prefix, ocvalues, keysp, ctx );
 
-	ch_free( ocvalues );
+	sl_free( ocvalues, ctx );
 	return rc;
 }
 
@@ -244,7 +242,8 @@ static int objectSubClassFilter(
 	MatchingRule *mr,
 	struct berval *prefix,
 	void * assertedValue,
-	BerVarray *keysp )
+	BerVarray *keysp,
+	void *ctx )
 {
 #if OCDEBUG
 	struct berval *bv = (struct berval *) assertedValue;
@@ -263,7 +262,7 @@ static int objectSubClassFilter(
 #endif
 
 	return octetStringFilter( use, flags, syntax, mr,
-		prefix, assertedValue, keysp );
+		prefix, assertedValue, keysp, ctx );
 }
 
 static ObjectClassSchemaCheckFN rootDseObjectClass;
@@ -319,12 +318,6 @@ static struct slap_schema_oc_map {
 			"matchingRuleUse ) )",
 		subentryObjectClass, SLAP_OC_OPERATIONAL,
 		offsetof(struct slap_internal_schema, si_oc_subschema) },
-	{ "monitor", "( 1.3.6.1.4.1.4203.666.3.2 NAME 'monitor' "
-		"DESC 'OpenLDAP system monitoring' "
-		"STRUCTURAL "
-		"MUST cn )",
-		0, SLAP_OC_OPERATIONAL,
-		offsetof(struct slap_internal_schema, si_oc_monitor) },
 #ifdef LDAP_DEVEL
 	{ "collectiveAttributeSubentry", "( 2.5.17.2 "
 			"NAME 'collectiveAttributeSubentry' "
@@ -473,7 +466,7 @@ static struct slap_schema_ad_map {
 			"SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
 		NULL, SLAP_AT_HIDE,
 		NULL, NULL, NULL, NULL, NULL,
-		offsetof(struct slap_internal_schema, si_ad_entryCSN) },
+		offsetof(struct slap_internal_schema, si_ad_namingCSN) },
 
 	{ "superiorUUID", "( 1.3.6.1.4.1.4203.666.1.11 NAME 'superiorUUID' "   
 			"DESC 'LCUP/LDUP: UUID of the superior entry' "
@@ -794,7 +787,6 @@ static struct slap_schema_ad_map {
 		NULL, NULL, NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_krbName) },
 #endif
-
 	{ NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0 }
 };
 
@@ -828,9 +820,8 @@ static struct slap_schema_mr_map {
 		offsetof(struct slap_internal_schema, si_mr_distinguishedNameMatch) },
 	{ "integerMatch",
 		offsetof(struct slap_internal_schema, si_mr_integerMatch) },
-	{ "integerFirstComponentMatch",
-		offsetof(struct slap_internal_schema,
-			si_mr_integerFirstComponentMatch) },
+	{ "integerFirstComponentMatch", offsetof(struct slap_internal_schema,
+		si_mr_integerFirstComponentMatch) },
 	{ NULL, 0 }
 };