X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschema_check.c;h=5d5aaa82b113824f835dcce47b6a773f78082466;hb=f8fb4aca7668c722f41941be719203aa8c298e12;hp=c30ee24612353980a3a47583a3655f9505744753;hpb=d23313a06862d599f45c1bbb3160974231b39157;p=openldap

diff --git a/servers/slapd/schema_check.c b/servers/slapd/schema_check.c
index c30ee24612..5d5aaa82b1 100644
--- a/servers/slapd/schema_check.c
+++ b/servers/slapd/schema_check.c
@@ -1,7 +1,7 @@
 /* schema_check.c - routines to enforce schema definitions */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -30,7 +30,9 @@ static char * oc_check_required(
 
 int
 entry_schema_check( 
-	Entry *e, Attribute *oldattrs,
+	Backend *be,
+	Entry *e,
+	Attribute *oldattrs,
 	const char** text,
 	char *textbuf, size_t textlen )
 {
@@ -43,21 +45,40 @@ entry_schema_check(
 	AttributeDescription *ad_objectClass
 		= slap_schema.si_ad_objectClass;
 	int extensible = 0;
+	int subentry = is_entry_subentry( e );
+	int collective = 0;
+
+	if( subentry) collective = is_entry_collectiveAttributes( e );
 
 	*text = textbuf;
 
-	/* check single-valued attrs for multiple values */
+	/* misc attribute checks */
 	for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
+		const char *type = a->a_desc->ad_cname.bv_val;
+
 		/* there should be at least one value */
 		assert( a->a_vals );
-		assert( a->a_vals[0] != NULL ); 
+		assert( a->a_vals[0].bv_val != NULL ); 
+
+		if( a->a_desc->ad_type->sat_check ) {
+			int rc = (a->a_desc->ad_type->sat_check)(
+				be, e, a, text, textbuf, textlen );
+			if( rc != LDAP_SUCCESS ) {
+				return rc;
+			}
+		}
+
+		if( !collective && is_at_collective( a->a_desc->ad_type ) ) {
+			snprintf( textbuf, textlen, "attribute '%s' "
+				"may only appear in collectiveAttributes subentry",
+				type );
+			return LDAP_OBJECT_CLASS_VIOLATION;
+		}
 
 		/* if single value type, check for multiple values */
 		if( is_at_single_value( a->a_desc->ad_type ) &&
-			a->a_vals[1] != NULL )
+			a->a_vals[1].bv_val != NULL )
 		{
-			char *type = a->a_desc->ad_cname.bv_val;
-
 			snprintf( textbuf, textlen, 
 				"attribute '%s' cannot have multiple values",
 				type );
@@ -97,14 +118,14 @@ entry_schema_check(
 	}
 
 	assert( asc->a_vals != NULL );
-	assert( asc->a_vals[0] != NULL );
-	assert( asc->a_vals[1] == NULL );
+	assert( asc->a_vals[0].bv_val != NULL );
+	assert( asc->a_vals[1].bv_val == NULL );
 
-	sc = oc_find( asc->a_vals[0]->bv_val );
+	sc = oc_bvfind( &asc->a_vals[0] );
 	if( sc == NULL ) {
 		snprintf( textbuf, textlen, 
 			"unrecognized structuralObjectClass '%s'",
-			aoc->a_vals[0]->bv_val );
+			asc->a_vals[0].bv_val );
 
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "schema", LDAP_LEVEL_INFO,
@@ -122,7 +143,7 @@ entry_schema_check(
 	if( sc->soc_kind != LDAP_SCHEMA_STRUCTURAL ) {
 		snprintf( textbuf, textlen, 
 			"structuralObjectClass '%s' is not STRUCTURAL",
-			aoc->a_vals[0]->bv_val );
+			asc->a_vals[0].bv_val );
 
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "schema", LDAP_LEVEL_INFO,
@@ -154,9 +175,9 @@ entry_schema_check(
 	}
 
 	assert( aoc->a_vals != NULL );
-	assert( aoc->a_vals[0] != NULL );
+	assert( aoc->a_vals[0].bv_val != NULL );
 
-	rc = structural_class( aoc->a_vals, &nsc, text, textbuf, textlen );
+	rc = structural_class( aoc->a_vals, &nsc, &oc, text, textbuf, textlen );
 	if( rc != LDAP_SUCCESS ) {
 		return rc;
 	} else if ( nsc.bv_len == 0 ) {
@@ -165,26 +186,25 @@ entry_schema_check(
 
 	*text = textbuf;
 
-	oc = oc_find( nsc.bv_val );
 	if ( oc == NULL ) {
 		snprintf( textbuf, textlen, 
 			"unrecognized objectClass '%s'",
-			aoc->a_vals[i]->bv_val );
+			aoc->a_vals[0].bv_val );
 		return LDAP_OBJECT_CLASS_VIOLATION;
 
 	} else if ( sc != oc ) {
 		snprintf( textbuf, textlen, 
 			"structuralObjectClass modification from '%s' to '%s' not allowed",
-			asc->a_vals[0]->bv_val, nsc.bv_val );
+			asc->a_vals[0].bv_val, nsc.bv_val );
 		return LDAP_NO_OBJECT_CLASS_MODS;
 	}
 
 	/* check that the entry has required attrs for each oc */
-	for ( i = 0; aoc->a_vals[i] != NULL; i++ ) {
-		if ( (oc = oc_find( aoc->a_vals[i]->bv_val )) == NULL ) {
+	for ( i = 0; aoc->a_vals[i].bv_val != NULL; i++ ) {
+		if ( (oc = oc_bvfind( &aoc->a_vals[i] )) == NULL ) {
 			snprintf( textbuf, textlen, 
 				"unrecognized objectClass '%s'",
-				aoc->a_vals[i]->bv_val );
+				aoc->a_vals[i].bv_val );
 
 #ifdef NEW_LOGGING
 			LDAP_LOG(( "schema", LDAP_LEVEL_INFO,
@@ -197,21 +217,29 @@ entry_schema_check(
 #endif
 
 			return LDAP_OBJECT_CLASS_VIOLATION;
+		}
 
-		} else if ( oc->soc_kind == LDAP_SCHEMA_ABSTRACT ) {
+		if ( oc->sco_check ) {
+			int rc = (oc->sco_check)( be, e, oc,
+				text, textbuf, textlen );
+			if( rc != LDAP_SUCCESS ) {
+				return rc;
+			}
+		}
+		if ( oc->soc_kind == LDAP_SCHEMA_ABSTRACT ) {
 			/* object class is abstract */
 			if ( oc != slap_schema.si_oc_top &&
 				!is_object_subclass( oc, sc ))
 			{
 				int j;
 				ObjectClass *xc = NULL;
-				for( j=0; aoc->a_vals[j]; j++ ) {
+				for( j=0; aoc->a_vals[j].bv_val; j++ ) {
 					if( i != j ) {
-						xc = oc_find( aoc->a_vals[i]->bv_val );
+						xc = oc_bvfind( &aoc->a_vals[i] );
 						if( xc == NULL ) {
 							snprintf( textbuf, textlen, 
 								"unrecognized objectClass '%s'",
-								aoc->a_vals[i]->bv_val );
+								aoc->a_vals[i].bv_val );
 
 #ifdef NEW_LOGGING
 							LDAP_LOG(( "schema", LDAP_LEVEL_INFO,
@@ -245,7 +273,7 @@ entry_schema_check(
 				if( xc == NULL ) {
 					snprintf( textbuf, textlen, "instanstantiation of "
 						"abstract objectClass '%s' not allowed",
-						aoc->a_vals[i]->bv_val );
+						aoc->a_vals[i].bv_val );
 
 #ifdef NEW_LOGGING
 					LDAP_LOG(( "schema", LDAP_LEVEL_INFO,
@@ -262,12 +290,12 @@ entry_schema_check(
 			}
 
 		} else if ( oc->soc_kind != LDAP_SCHEMA_STRUCTURAL || oc == sc ) {
-			char *s = oc_check_required( e, oc, aoc->a_vals[i] );
+			char *s = oc_check_required( e, oc, &aoc->a_vals[i] );
 
 			if (s != NULL) {
 				snprintf( textbuf, textlen, 
 					"object class '%s' requires attribute '%s'",
-					aoc->a_vals[i]->bv_val, s );
+					aoc->a_vals[i].bv_val, s );
 
 #ifdef NEW_LOGGING
 				LDAP_LOG(( "schema", LDAP_LEVEL_INFO,
@@ -365,7 +393,7 @@ oc_check_required(
 
 int oc_check_allowed(
 	AttributeType *at,
-	struct berval **ocl,
+	BVarray ocl,
 	ObjectClass *sc )
 {
 	int		i, j;
@@ -413,9 +441,9 @@ int oc_check_allowed(
 	}
 
 	/* check that the type appears as req or opt in at least one oc */
-	for ( i = 0; ocl[i] != NULL; i++ ) {
+	for ( i = 0; ocl[i].bv_val != NULL; i++ ) {
 		/* if we know about the oc */
-		ObjectClass	*oc = oc_find( ocl[i]->bv_val );
+		ObjectClass	*oc = oc_bvfind( &ocl[i] );
 		if ( oc != NULL && oc->soc_kind != LDAP_SCHEMA_ABSTRACT &&
 			( sc == NULL || oc->soc_kind == LDAP_SCHEMA_AUXILIARY ))
 		{
@@ -446,8 +474,9 @@ int oc_check_allowed(
  * Determine the structural object class from a set of OIDs
  */
 int structural_class(
-	struct berval **ocs,
+	BVarray ocs,
 	struct berval *scbv,
+	ObjectClass **scp,
 	const char **text,
 	char *textbuf, size_t textlen )
 {
@@ -459,13 +488,13 @@ int structural_class(
 	*text = "structural_class: internal error";
 	scbv->bv_len = 0;
 
-	for( i=0; ocs[i]; i++ ) {
-		oc = oc_find( ocs[i]->bv_val );
+	for( i=0; ocs[i].bv_val; i++ ) {
+		oc = oc_bvfind( &ocs[i] );
 
 		if( oc == NULL ) {
 			snprintf( textbuf, textlen,
 				"unrecongized objectClass '%s'",
-				ocs[i]->bv_val );
+				ocs[i].bv_val );
 			*text = textbuf;
 			return LDAP_OBJECT_CLASS_VIOLATION;
 		}
@@ -480,13 +509,13 @@ int structural_class(
 				ObjectClass *xc = NULL;
 
 				/* find common superior */
-				for( j=i+1; ocs[j]; j++ ) {
-					xc = oc_find( ocs[j]->bv_val );
+				for( j=i+1; ocs[j].bv_val; j++ ) {
+					xc = oc_bvfind( &ocs[j] );
 
 					if( xc == NULL ) {
 						snprintf( textbuf, textlen,
 							"unrecongized objectClass '%s'",
-							ocs[i]->bv_val );
+							ocs[i].bv_val );
 						*text = textbuf;
 						return LDAP_OBJECT_CLASS_VIOLATION;
 					}
@@ -510,7 +539,7 @@ int structural_class(
 					/* no common subclass */
 					snprintf( textbuf, textlen,
 						"invalid structural object class chain (%s/%s)",
-						ocs[scn]->bv_val, ocs[i]->bv_val );
+						ocs[scn].bv_val, ocs[i].bv_val );
 					*text = textbuf;
 					return LDAP_OBJECT_CLASS_VIOLATION;
 				}
@@ -518,12 +547,15 @@ int structural_class(
 		}
 	}
 
+	if( scp )
+		*scp = sc;
+
 	if( sc == NULL ) {
 		*text = "no structural object classes provided";
 		return LDAP_OBJECT_CLASS_VIOLATION;
 	}
 
-	*scbv = *ocs[scn];
+	*scbv = ocs[scn];
 	return LDAP_SUCCESS;
 }
 
@@ -553,11 +585,11 @@ int mods_structural_class(
 		return LDAP_OBJECT_CLASS_VIOLATION;
 	}
 
-	if( ocmod->sml_bvalues == NULL || ocmod->sml_bvalues[0] == NULL ) {
+	if( ocmod->sml_bvalues == NULL || ocmod->sml_bvalues[0].bv_val == NULL ) {
 		*text = "objectClass attribute has no values";
 		return LDAP_OBJECT_CLASS_VIOLATION;
 	}
 
-	return structural_class( ocmod->sml_bvalues, sc,
+	return structural_class( ocmod->sml_bvalues, sc, NULL,
 		text, textbuf, textlen );
 }