X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fschema_check.c;h=2c46ede1559f3984cc9e97bf6cc89e462010fcdf;hb=05752bea50e1bcca485aad61ca4a291cc6e01b7c;hp=729873da17af4c9eafd308581751b7642b8999a2;hpb=deac70a6deb65feda98bdea5f3aeb0e9c1b818b8;p=openldap

diff --git a/servers/slapd/schema_check.c b/servers/slapd/schema_check.c
index 729873da17..2c46ede155 100644
--- a/servers/slapd/schema_check.c
+++ b/servers/slapd/schema_check.c
@@ -1,8 +1,17 @@
 /* schema_check.c - routines to enforce schema definitions */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2008 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -14,17 +23,17 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "ldap_pvt.h"
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-static int oc_check_allowed(
-	AttributeType *type,
-	struct berval **oclist );
-#else
-static int		oc_check_allowed(char *type, struct berval **oclist);
-#endif
-static char *	oc_check_required(Entry *e, struct berval *ocname);
+static char * oc_check_required(
+	Entry *e,
+	ObjectClass *oc,
+	struct berval *ocname );
 
+static int entry_naming_check(
+	Entry *e,
+	int manage,
+	const char** text,
+	char *textbuf, size_t textlen );
 /*
  * entry_schema_check - check that entry e conforms to the schema required
  * by its object class(es).
@@ -34,98 +43,456 @@ static char *	oc_check_required(Entry *e, struct berval *ocname);
 
 int
 entry_schema_check( 
-	Entry *e, Attribute *oldattrs, char** text )
+	Operation *op,
+	Entry *e,
+	Attribute *oldattrs,
+	int manage,
+	const char** text,
+	char *textbuf, size_t textlen )
 {
-	Attribute	*a, *aoc;
-	ObjectClass *oc;
-	int		i;
-	int		ret;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-	AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
-#else
-	static const char *ad_objectClass = "objectclass";
-#endif
-
-	if( !global_schemacheck ) return LDAP_SUCCESS;
-
-	/* find the object class attribute - could error out here */
-	if ( (aoc = attr_find( e->e_attrs, ad_objectClass )) == NULL ) {
-		Debug( LDAP_DEBUG_ANY, "No object class for entry (%s)\n",
+	Attribute	*a, *asc, *aoc;
+	ObjectClass *sc, *oc;
+	AttributeType *at;
+	ContentRule *cr;
+	int	rc, i;
+	struct berval nsc;
+	AttributeDescription *ad_structuralObjectClass
+		= slap_schema.si_ad_structuralObjectClass;
+	AttributeDescription *ad_objectClass
+		= slap_schema.si_ad_objectClass;
+	int extensible = 0;
+	int subentry = is_entry_subentry( e );
+	int collectiveSubentry = 0;
+
+	if ( SLAP_NO_SCHEMA_CHECK( op->o_bd )) {
+		return LDAP_SUCCESS;
+	}
+
+	if ( get_no_schema_check( op ) ) {
+		return LDAP_SUCCESS;
+	}
+
+	if( subentry ) {
+		collectiveSubentry = is_entry_collectiveAttributeSubentry( e );
+	}
+
+	*text = textbuf;
+
+	/* 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 != 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)(
+				op->o_bd, e, a, text, textbuf, textlen );
+			if( rc != LDAP_SUCCESS ) {
+				return rc;
+			}
+		}
+
+		if( !collectiveSubentry && is_at_collective( a->a_desc->ad_type ) ) {
+			snprintf( textbuf, textlen,
+				"'%s' can only appear in collectiveAttributeSubentry",
+				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].bv_val != NULL )
+		{
+			snprintf( textbuf, textlen, 
+				"attribute '%s' cannot have multiple values",
+				type );
+
+			Debug( LDAP_DEBUG_ANY,
+			    "Entry (%s), %s\n",
+			    e->e_dn, textbuf, 0 );
+
+			return LDAP_CONSTRAINT_VIOLATION;
+		}
+	}
+
+	/* find the structural object class attribute */
+	asc = attr_find( e->e_attrs, ad_structuralObjectClass );
+	if ( asc == NULL ) {
+		Debug( LDAP_DEBUG_ANY,
+			"No structuralObjectClass for entry (%s)\n",
 		    e->e_dn, 0, 0 );
 
-		*text = "no objectclass attribute";
-		return oldattrs != NULL
-			? LDAP_OBJECT_CLASS_VIOLATION
-			: LDAP_NO_OBJECT_CLASS_MODS;
+		*text = "no structuralObjectClass operational attribute";
+		return LDAP_OTHER;
+	}
+
+	assert( asc->a_vals != NULL );
+	assert( asc->a_vals[0].bv_val != NULL );
+	assert( asc->a_vals[1].bv_val == NULL );
+
+	sc = oc_bvfind( &asc->a_vals[0] );
+	if( sc == NULL ) {
+		snprintf( textbuf, textlen, 
+			"unrecognized structuralObjectClass '%s'",
+			asc->a_vals[0].bv_val );
+
+		Debug( LDAP_DEBUG_ANY,
+			"entry_check_schema(%s): %s\n",
+			e->e_dn, textbuf, 0 );
+
+		return LDAP_OBJECT_CLASS_VIOLATION;
 	}
 
-	ret = LDAP_SUCCESS;
+	if( sc->soc_kind != LDAP_SCHEMA_STRUCTURAL ) {
+		snprintf( textbuf, textlen, 
+			"structuralObjectClass '%s' is not STRUCTURAL",
+			asc->a_vals[0].bv_val );
+
+		Debug( LDAP_DEBUG_ANY,
+			"entry_check_schema(%s): %s\n",
+			e->e_dn, textbuf, 0 );
+
+		return LDAP_OTHER;
+	}
+
+	if( !manage && sc->soc_obsolete ) {
+		snprintf( textbuf, textlen, 
+			"structuralObjectClass '%s' is OBSOLETE",
+			asc->a_vals[0].bv_val );
+
+		Debug( LDAP_DEBUG_ANY,
+			"entry_check_schema(%s): %s\n",
+			e->e_dn, textbuf, 0 );
+
+		return LDAP_OBJECT_CLASS_VIOLATION;
+	}
+
+	/* find the object class attribute */
+	aoc = attr_find( e->e_attrs, ad_objectClass );
+	if ( aoc == NULL ) {
+		Debug( LDAP_DEBUG_ANY, "No objectClass for entry (%s)\n",
+		    e->e_dn, 0, 0 );
+
+		*text = "no objectClass attribute";
+		return LDAP_OBJECT_CLASS_VIOLATION;
+	}
+
+	assert( aoc->a_vals != NULL );
+	assert( aoc->a_vals[0].bv_val != NULL );
+
+	rc = structural_class( aoc->a_vals, &nsc, &oc, text, textbuf, textlen );
+	if( rc != LDAP_SUCCESS ) {
+		return rc;
+	}
+
+	*text = textbuf;
+
+	if ( oc == NULL ) {
+		snprintf( textbuf, textlen, 
+			"unrecognized objectClass '%s'",
+			aoc->a_vals[0].bv_val );
+		return LDAP_OBJECT_CLASS_VIOLATION;
+
+	} else if ( sc != slap_schema.si_oc_glue && sc != oc ) {
+		snprintf( textbuf, textlen, 
+			"structural object class modification "
+			"from '%s' to '%s' not allowed",
+			asc->a_vals[0].bv_val, nsc.bv_val );
+		return LDAP_NO_OBJECT_CLASS_MODS;
+	} else if ( sc == slap_schema.si_oc_glue ) {
+		sc = oc;
+	}
+
+	/* naming check */
+	if ( !is_entry_objectclass ( e, slap_schema.si_oc_glue, 0 ) ) {
+		rc = entry_naming_check( e, manage, text, textbuf, textlen );
+		if( rc != LDAP_SUCCESS ) {
+			return rc;
+		}
+	} else {
+		/* Glue Entry */
+	}
+
+	/* find the content rule for the structural class */
+	cr = cr_find( sc->soc_oid );
+
+	/* the cr must be same as the structural class */
+	assert( !cr || !strcmp( cr->scr_oid, sc->soc_oid ) );
+
+	/* check that the entry has required attrs of the content rule */
+	if( cr ) {
+		if( !manage && cr->scr_obsolete ) {
+			snprintf( textbuf, textlen, 
+				"content rule '%s' is obsolete",
+				ldap_contentrule2name( &cr->scr_crule ));
+
+			Debug( LDAP_DEBUG_ANY,
+				"Entry (%s): %s\n",
+				e->e_dn, textbuf, 0 );
+
+			return LDAP_OBJECT_CLASS_VIOLATION;
+		}
+
+		if( cr->scr_required ) for( i=0; cr->scr_required[i]; i++ ) {
+			at = cr->scr_required[i];
+
+			for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
+				if( a->a_desc->ad_type == at ) {
+					break;
+				}
+			}
+
+			/* not there => schema violation */
+			if ( a == NULL ) {
+				snprintf( textbuf, textlen, 
+					"content rule '%s' requires attribute '%s'",
+					ldap_contentrule2name( &cr->scr_crule ),
+					at->sat_cname.bv_val );
+
+				Debug( LDAP_DEBUG_ANY,
+					"Entry (%s): %s\n",
+					e->e_dn, textbuf, 0 );
+
+				return LDAP_OBJECT_CLASS_VIOLATION;
+			}
+		}
+
+		if( cr->scr_precluded ) for( i=0; cr->scr_precluded[i]; i++ ) {
+			at = cr->scr_precluded[i];
+
+			for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
+				if( a->a_desc->ad_type == at ) {
+					break;
+				}
+			}
+
+			/* there => schema violation */
+			if ( a != NULL ) {
+				snprintf( textbuf, textlen, 
+					"content rule '%s' precluded attribute '%s'",
+					ldap_contentrule2name( &cr->scr_crule ),
+					at->sat_cname.bv_val );
+
+				Debug( LDAP_DEBUG_ANY,
+					"Entry (%s): %s\n",
+					e->e_dn, textbuf, 0 );
+
+				return LDAP_OBJECT_CLASS_VIOLATION;
+			}
+		}
+	}
 
 	/* 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 );
+
+			Debug( LDAP_DEBUG_ANY,
+				"entry_check_schema(%s): %s\n",
+				e->e_dn, textbuf, 0 );
+
+			return LDAP_OBJECT_CLASS_VIOLATION;
+		}
+
+		if ( !manage && oc->soc_obsolete ) {
+			/* disallow obsolete classes */
+			snprintf( textbuf, textlen, 
+				"objectClass '%s' is OBSOLETE",
+				aoc->a_vals[i].bv_val );
+
 			Debug( LDAP_DEBUG_ANY,
-				"Objectclass \"%s\" not defined\n",
-				aoc->a_vals[i]->bv_val, 0, 0 );
+				"entry_check_schema(%s): %s\n",
+				e->e_dn, textbuf, 0 );
+
+			return LDAP_OBJECT_CLASS_VIOLATION;
+		}
+
+		if ( oc->soc_check ) {
+			int rc = (oc->soc_check)( op->o_bd, 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].bv_val; j++ ) {
+					if( i != j ) {
+						xc = oc_bvfind( &aoc->a_vals[j] );
+						if( xc == NULL ) {
+							snprintf( textbuf, textlen, 
+								"unrecognized objectClass '%s'",
+								aoc->a_vals[j].bv_val );
+
+							Debug( LDAP_DEBUG_ANY,
+								"entry_check_schema(%s): %s\n",
+								e->e_dn, textbuf, 0 );
+
+							return LDAP_OBJECT_CLASS_VIOLATION;
+						}
+
+						/* since we previous check against the
+						 * structural object of this entry, the
+						 * abstract class must be a (direct or indirect)
+						 * superclass of one of the auxiliary classes of
+						 * the entry.
+						 */
+						if ( xc->soc_kind == LDAP_SCHEMA_AUXILIARY &&
+							is_object_subclass( oc, xc ) )
+						{
+							xc = NULL;
+							break;
+						}
+					}
+				}
+
+				if( xc != NULL ) {
+					snprintf( textbuf, textlen, "instantiation of "
+						"abstract objectClass '%s' not allowed",
+						aoc->a_vals[i].bv_val );
+
+					Debug( LDAP_DEBUG_ANY,
+						"entry_check_schema(%s): %s\n",
+						e->e_dn, textbuf, 0 );
+
+					return LDAP_OBJECT_CLASS_VIOLATION;
+				}
+			}
 
-		} else {
-			char *s = oc_check_required( e, aoc->a_vals[i] );
+		} else if ( oc->soc_kind != LDAP_SCHEMA_STRUCTURAL || oc == sc ) {
+			char *s;
 
+			if( oc->soc_kind == LDAP_SCHEMA_AUXILIARY ) {
+				int k;
+
+				if( cr ) {
+					int j;
+
+					k = -1;
+					if( cr->scr_auxiliaries ) {
+						for( j = 0; cr->scr_auxiliaries[j]; j++ ) {
+							if( cr->scr_auxiliaries[j] == oc ) {
+								k = 0;
+								break;
+							}
+						}
+					}
+				} else if ( global_disallows & SLAP_DISALLOW_AUX_WO_CR ) {
+					k = -1;
+				} else {
+					k = 0;	
+				}
+
+				if( k == -1 ) {
+					snprintf( textbuf, textlen, 
+						"content rule '%s' does not allow class '%s'",
+						ldap_contentrule2name( &cr->scr_crule ),
+						oc->soc_cname.bv_val );
+
+					Debug( LDAP_DEBUG_ANY,
+						"Entry (%s): %s\n",
+						e->e_dn, textbuf, 0 );
+
+					return LDAP_OBJECT_CLASS_VIOLATION;
+				}
+			}
+
+			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 );
+
 				Debug( LDAP_DEBUG_ANY,
-					"Entry (%s), oc \"%s\" requires attr \"%s\"\n",
-					e->e_dn, aoc->a_vals[i]->bv_val, s );
-				*text = "missing required attribute";
-				ret = LDAP_OBJECT_CLASS_VIOLATION;
-				break;
+					"Entry (%s): %s\n",
+					e->e_dn, textbuf, 0 );
+
+				return LDAP_OBJECT_CLASS_VIOLATION;
+			}
+
+			if( oc == slap_schema.si_oc_extensibleObject ) {
+				extensible=1;
 			}
 		}
 	}
 
-	if ( ret != LDAP_SUCCESS ) {
-	    return ret;
+	if( extensible ) {
+		*text = NULL;
+		return LDAP_SUCCESS;
 	}
 
 	/* check that each attr in the entry is allowed by some oc */
 	for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-		ret = oc_check_allowed( a->a_desc->ad_type, aoc->a_vals );
-#else
-		ret = oc_check_allowed( a->a_type, aoc->a_vals );
-#endif
-		if ( ret != 0 ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-			char *type = a->a_desc->ad_cname->bv_val;
-#else
-			char *type = a->a_type;
-#endif
+		int ret;
+
+ 		ret = LDAP_OBJECT_CLASS_VIOLATION;
+
+		if( cr && cr->scr_required ) {
+			for( i=0; cr->scr_required[i]; i++ ) {
+				if( cr->scr_required[i] == a->a_desc->ad_type ) {
+					ret = LDAP_SUCCESS;
+					break;
+				}
+			}
+		}
+
+		if( ret != LDAP_SUCCESS && cr && cr->scr_allowed ) {
+			for( i=0; cr->scr_allowed[i]; i++ ) {
+				if( cr->scr_allowed[i] == a->a_desc->ad_type ) {
+					ret = LDAP_SUCCESS;
+					break;
+				}
+			}
+		}
+
+		if( ret != LDAP_SUCCESS ) 
+		{
+			ret = oc_check_allowed( a->a_desc->ad_type, aoc->a_vals, sc );
+		}
+
+		if ( ret != LDAP_SUCCESS ) {
+			char *type = a->a_desc->ad_cname.bv_val;
+
+			snprintf( textbuf, textlen, 
+				"attribute '%s' not allowed",
+				type );
+
 			Debug( LDAP_DEBUG_ANY,
-			    "Entry (%s), attr \"%s\" not allowed\n",
-			    e->e_dn, type, 0 );
-			*text = "attribute not allowed";
-			break;
+			    "Entry (%s), %s\n",
+			    e->e_dn, textbuf, 0 );
+
+			return ret;
 		}
 	}
 
-	return( ret );
+	*text = NULL;
+	return LDAP_SUCCESS;
 }
 
 static char *
-oc_check_required( Entry *e, struct berval *ocname )
+oc_check_required(
+	Entry *e,
+	ObjectClass *oc,
+	struct berval *ocname )
 {
-	ObjectClass	*oc;
 	AttributeType	*at;
 	int		i;
 	Attribute	*a;
 
 	Debug( LDAP_DEBUG_TRACE,
-	       "oc_check_required entry (%s), objectclass \"%s\"\n",
-	       e->e_dn, ocname, 0 );
+		"oc_check_required entry (%s), objectClass \"%s\"\n",
+		e->e_dn, ocname->bv_val, 0 );
 
-	/* find global oc defn. it we don't know about it assume it's ok */
-	if ( (oc = oc_find( ocname->bv_val )) == NULL ) {
-		return NULL;
-	}
 
 	/* check for empty oc_required */
 	if(oc->soc_required == NULL) {
@@ -137,199 +504,362 @@ oc_check_required( Entry *e, struct berval *ocname )
 		at = oc->soc_required[i];
 		/* see if it's in the entry */
 		for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 			if( a->a_desc->ad_type == at ) {
 				break;
 			}
-#else
-			char		**pp;
-
-			if ( at->sat_oid &&
-			     strcmp( a->a_type, at->sat_oid ) == 0 ) {
-				break;
-			}
-			pp = at->sat_names;
-			if ( pp  == NULL ) {
-				/* Empty name list => not found */
-				a = NULL;
-				break;
-			}
-			while ( *pp ) {
-				if ( strcasecmp( a->a_type, *pp ) == 0 ) {
-					break;
-				}
-				pp++;
-			}
-			if ( *pp ) {
-				break;
-			}
-#endif
 		}
 		/* not there => schema violation */
 		if ( a == NULL ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-			return at->sat_cname;
-#else
-			if ( at->sat_names && at->sat_names[0] ) {
-				return at->sat_names[0];
-			} else {
-				return at->sat_oid;
-			}
-#endif
+			return at->sat_cname.bv_val;
 		}
 	}
 
 	return( NULL );
 }
 
-static int
-oc_check_allowed(
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
+int oc_check_allowed(
 	AttributeType *at,
-#else
-	char *type,
-#endif
-	struct berval **ocl )
+	BerVarray ocl,
+	ObjectClass *sc )
 {
-	ObjectClass	*oc;
 	int		i, j;
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 	Debug( LDAP_DEBUG_TRACE,
 		"oc_check_allowed type \"%s\"\n",
-		at->sat_cname, 0, 0 );
+		at->sat_cname.bv_val, 0, 0 );
 
-	/* always allow objectclass attribute */
-	if ( strcasecmp( at->sat_cname, "objectclass" ) == 0 ) {
+	/* always allow objectClass attribute */
+	if ( strcasecmp( at->sat_cname.bv_val, "objectClass" ) == 0 ) {
 		return LDAP_SUCCESS;
 	}
 
-#else
-	AttributeType	*at;
-	char		**pp;
-	char		*p;
-	char		*t;
-
-	Debug( LDAP_DEBUG_TRACE,
-	       "oc_check_allowed type \"%s\"\n", type, 0, 0 );
-
-	/* always allow objectclass attribute */
-	if ( strcasecmp( type, "objectclass" ) == 0 ) {
-		return LDAP_SUCCESS;
-	}
-#endif
-
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-	if( is_at_operational(at) ) {
-		return LDAP_SUCCESS;
-	}
-#else
-	/*
-	 * The "type" we have received is actually an AttributeDescription.
-	 * Let's find out the corresponding type.
-	 */
-	p = strchr( type, ';' );
-	if ( p ) {
-		t = ch_malloc( p-type+1 );
-		strncpy( t, type, p-type );
-		t[p-type] = '\0';
-		Debug( LDAP_DEBUG_TRACE,
-		       "oc_check_allowed type \"%s\" from \"%s\"\n",
-		       t, type, 0 );
-
-	} else
-	{
-		t = type;
-	}
-
 	/*
 	 * All operational attributions are allowed by schema rules.
 	 */
-	if ( oc_check_op_attr( t ) ) {
+	if( is_at_operational(at) ) {
 		return LDAP_SUCCESS;
 	}
-#endif
+
+	/* check to see if its allowed by the structuralObjectClass */
+	if( sc ) {
+		/* does it require the type? */
+		for ( j = 0; sc->soc_required != NULL && 
+			sc->soc_required[j] != NULL; j++ )
+		{
+			if( at == sc->soc_required[j] ) {
+				return LDAP_SUCCESS;
+			}
+		}
+
+		/* does it allow the type? */
+		for ( j = 0; sc->soc_allowed != NULL && 
+			sc->soc_allowed[j] != NULL; j++ )
+		{
+			if( at == sc->soc_allowed[j] ) {
+				return LDAP_SUCCESS;
+			}
+		}
+	}
 
 	/* 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 */
-		if ( (oc = oc_find( ocl[i]->bv_val )) != NULL ) {
+		ObjectClass	*oc = oc_bvfind( &ocl[i] );
+		if ( oc != NULL && oc->soc_kind != LDAP_SCHEMA_ABSTRACT &&
+			( sc == NULL || oc->soc_kind == LDAP_SCHEMA_AUXILIARY ))
+		{
 			/* does it require the type? */
 			for ( j = 0; oc->soc_required != NULL && 
 				oc->soc_required[j] != NULL; j++ )
 			{
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 				if( at == oc->soc_required[j] ) {
 					return LDAP_SUCCESS;
 				}
-#else
-				at = oc->soc_required[j];
-				if ( at->sat_oid &&
-				     strcmp(at->sat_oid, t ) == 0 ) {
-					if ( t != type )
-						ldap_memfree( t );
-					return LDAP_SUCCESS;
-				}
-				pp = at->sat_names;
-				if ( pp == NULL )
-					continue;
-				while ( *pp ) {
-					if ( strcasecmp( *pp, t ) == 0 ) {
-						if ( t != type )
-							ldap_memfree( t );
-						return LDAP_SUCCESS;
-					}
-					pp++;
-				}
-#endif
 			}
 			/* does it allow the type? */
 			for ( j = 0; oc->soc_allowed != NULL && 
 				oc->soc_allowed[j] != NULL; j++ )
 			{
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 				if( at == oc->soc_allowed[j] ) {
 					return LDAP_SUCCESS;
 				}
-#else
-				at = oc->soc_allowed[j];
-				if ( at->sat_oid &&
-				     strcmp( at->sat_oid, t ) == 0 ) {
-					if ( t != type )
-						ldap_memfree( t );
-					return LDAP_SUCCESS;
-				}
-				pp = at->sat_names;
-				if ( pp == NULL )
-					continue;
-				while ( *pp ) {
-					if ( strcasecmp( *pp, t ) == 0 ||
-					     strcmp( *pp, "*" ) == 0 ) {
-						if ( t != type )
-							ldap_memfree( t );
-						return LDAP_SUCCESS;
+			}
+		}
+	}
+
+	/* not allowed by any oc */
+	return LDAP_OBJECT_CLASS_VIOLATION;
+}
+
+/*
+ * Determine the structural object class from a set of OIDs
+ */
+int structural_class(
+	BerVarray ocs,
+	struct berval *scbv,
+	ObjectClass **scp,
+	const char **text,
+	char *textbuf, size_t textlen )
+{
+	int i;
+	ObjectClass *oc;
+	ObjectClass *sc = NULL;
+	int scn = -1;
+
+	*text = "structural_class: internal error";
+	scbv->bv_len = 0;
+
+	for( i=0; ocs[i].bv_val; i++ ) {
+		oc = oc_bvfind( &ocs[i] );
+
+		if( oc == NULL ) {
+			snprintf( textbuf, textlen,
+				"unrecognized objectClass '%s'",
+				ocs[i].bv_val );
+			*text = textbuf;
+			return LDAP_OBJECT_CLASS_VIOLATION;
+		}
+
+		if( oc->soc_kind == LDAP_SCHEMA_STRUCTURAL ) {
+			if( sc == NULL || is_object_subclass( sc, oc ) ) {
+				sc = oc;
+				scn = i;
+
+			} else if ( !is_object_subclass( oc, sc ) ) {
+				int j;
+				ObjectClass *xc = NULL;
+
+				/* find common superior */
+				for( j=i+1; ocs[j].bv_val; j++ ) {
+					xc = oc_bvfind( &ocs[j] );
+
+					if( xc == NULL ) {
+						snprintf( textbuf, textlen,
+							"unrecognized objectClass '%s'",
+							ocs[j].bv_val );
+						*text = textbuf;
+						return LDAP_OBJECT_CLASS_VIOLATION;
 					}
-					pp++;
+
+					if( xc->soc_kind != LDAP_SCHEMA_STRUCTURAL ) {
+						xc = NULL;
+						continue;
+					}
+
+					if( is_object_subclass( sc, xc ) &&
+						is_object_subclass( oc, xc ) )
+					{
+						/* found common subclass */
+						break;
+					}
+
+					xc = NULL;
+				}
+
+				if( xc == NULL ) {
+					/* no common subclass */
+					snprintf( textbuf, textlen,
+						"invalid structural object class chain (%s/%s)",
+						ocs[scn].bv_val, ocs[i].bv_val );
+					*text = textbuf;
+					return LDAP_OBJECT_CLASS_VIOLATION;
 				}
-#endif
 			}
-			/* maybe the next oc allows it */
+		}
+	}
 
-#ifdef OC_UNDEFINED_IMPLES_EXTENSIBLE
-		/* we don't know about the oc. assume it allows it */
-		} else {
-			if ( t != type )
-				ldap_memfree( t );
-			return LDAP_SUCCESS;
-#endif
+	if( scp ) {
+		*scp = sc;
+	}
+
+	if( sc == NULL ) {
+		*text = "no structural object class provided";
+		return LDAP_OBJECT_CLASS_VIOLATION;
+	}
+
+	if( scn < 0 ) {
+		*text = "invalid structural object class";
+		return LDAP_OBJECT_CLASS_VIOLATION;
+	}
+
+	*scbv = ocs[scn];
+
+	if( scbv->bv_len == 0 ) {
+		*text = "invalid structural object class";
+		return LDAP_OBJECT_CLASS_VIOLATION;
+	}
+
+	*text = NULL;
+
+	return LDAP_SUCCESS;
+}
+
+/*
+ * Return structural object class from list of modifications
+ */
+int mods_structural_class(
+	Modifications *mods,
+	struct berval *sc,
+	const char **text,
+	char *textbuf, size_t textlen )
+{
+	Modifications *ocmod = NULL;
+
+	for( ; mods != NULL; mods = mods->sml_next ) {
+		if( mods->sml_desc == slap_schema.si_ad_objectClass ) {
+			if( ocmod != NULL ) {
+				*text = "entry has multiple objectClass attributes";
+				return LDAP_OBJECT_CLASS_VIOLATION;
+			}
+			ocmod = mods;
 		}
 	}
 
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
-	if ( t != type )
-		ldap_memfree( t );
-#endif
+	if( ocmod == NULL ) {
+		*text = "entry has no objectClass attribute";
+		return LDAP_OBJECT_CLASS_VIOLATION;
+	}
 
-	/* not allowed by any oc */
-	return LDAP_OBJECT_CLASS_VIOLATION;
+	if( ocmod->sml_values == NULL || ocmod->sml_values[0].bv_val == NULL ) {
+		*text = "objectClass attribute has no values";
+		return LDAP_OBJECT_CLASS_VIOLATION;
+	}
+
+	return structural_class( ocmod->sml_values, sc, NULL,
+		text, textbuf, textlen );
+}
+
+
+static int
+entry_naming_check(
+	Entry *e,
+	int manage,
+	const char** text,
+	char *textbuf, size_t textlen )
+{
+	/* naming check */
+	LDAPRDN		rdn = NULL;
+	const char	*p = NULL;
+	ber_len_t	cnt;
+	int		rc = LDAP_SUCCESS;
+
+	if ( BER_BVISEMPTY( &e->e_name )) {
+		return LDAP_SUCCESS;
+	}
+
+	/*
+	 * Get attribute type(s) and attribute value(s) of our RDN
+	 */
+	if ( ldap_bv2rdn( &e->e_name, &rdn, (char **)&p,
+		LDAP_DN_FORMAT_LDAP ) )
+	{
+		*text = "unrecongized attribute type(s) in RDN";
+		return LDAP_INVALID_DN_SYNTAX;
+	}
+
+	/* Check that each AVA of the RDN is present in the entry */
+	/* FIXME: Should also check that each AVA lists a distinct type */
+	for ( cnt = 0; rdn[cnt]; cnt++ ) {
+		LDAPAVA *ava = rdn[cnt];
+		AttributeDescription *desc = NULL;
+		Attribute *attr;
+		const char *errtext;
+
+		if( ava->la_flags & LDAP_AVA_BINARY ) {
+			snprintf( textbuf, textlen, 
+				"value of naming attribute '%s' in unsupported BER form",
+				ava->la_attr.bv_val );
+			rc = LDAP_NAMING_VIOLATION;
+		}
+
+		rc = slap_bv2ad( &ava->la_attr, &desc, &errtext );
+		if ( rc != LDAP_SUCCESS ) {
+			snprintf( textbuf, textlen, "%s (in RDN)", errtext );
+			break;
+		}
+
+		if( desc->ad_type->sat_usage ) {
+			snprintf( textbuf, textlen, 
+				"naming attribute '%s' is operational",
+				ava->la_attr.bv_val );
+			rc = LDAP_NAMING_VIOLATION;
+			break;
+		}
+ 
+		if( desc->ad_type->sat_collective ) {
+			snprintf( textbuf, textlen, 
+				"naming attribute '%s' is collective",
+				ava->la_attr.bv_val );
+			rc = LDAP_NAMING_VIOLATION;
+			break;
+		}
+
+		if( !manage && desc->ad_type->sat_obsolete ) {
+			snprintf( textbuf, textlen, 
+				"naming attribute '%s' is obsolete",
+				ava->la_attr.bv_val );
+			rc = LDAP_NAMING_VIOLATION;
+			break;
+		}
+
+		if( !desc->ad_type->sat_equality ) {
+			snprintf( textbuf, textlen, 
+				"naming attribute '%s' has no equality matching rule",
+				ava->la_attr.bv_val );
+			rc = LDAP_NAMING_VIOLATION;
+			break;
+		}
+
+		if( !desc->ad_type->sat_equality->smr_match ) {
+			snprintf( textbuf, textlen, 
+				"naming attribute '%s' has unsupported equality matching rule",
+				ava->la_attr.bv_val );
+			rc = LDAP_NAMING_VIOLATION;
+			break;
+		}
+
+		/* find the naming attribute */
+		attr = attr_find( e->e_attrs, desc );
+		if ( attr == NULL ) {
+			snprintf( textbuf, textlen, 
+				"naming attribute '%s' is not present in entry",
+				ava->la_attr.bv_val );
+			rc = LDAP_NAMING_VIOLATION;
+			break;
+		}
+
+		rc = value_find_ex( desc, SLAP_MR_VALUE_OF_ASSERTION_SYNTAX|
+			SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH,
+			attr->a_nvals, &ava->la_value, NULL );
+
+		if( rc != 0 ) {
+			switch( rc ) {
+			case LDAP_INAPPROPRIATE_MATCHING:
+				snprintf( textbuf, textlen, 
+					"inappropriate matching for naming attribute '%s'",
+					ava->la_attr.bv_val );
+				break;
+			case LDAP_INVALID_SYNTAX:
+				snprintf( textbuf, textlen, 
+					"value of naming attribute '%s' is invalid",
+					ava->la_attr.bv_val );
+				break;
+			case LDAP_NO_SUCH_ATTRIBUTE:
+				snprintf( textbuf, textlen, 
+					"value of naming attribute '%s' is not present in entry",
+					ava->la_attr.bv_val );
+				break;
+			default:
+				snprintf( textbuf, textlen, 
+					"naming attribute '%s' is inappropriate",
+					ava->la_attr.bv_val );
+			}
+			rc = LDAP_NAMING_VIOLATION;
+			break;
+		}
+	}
+
+	ldap_rdnfree( rdn );
+	return rc;
 }
+