]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/schema_check.c
Add another safety check
[openldap] / servers / slapd / schema_check.c
index 351b9c416fe64e31cb7c7dfa67cb512b2283281d..0412bb4f2028bd2ebefec86835c42cca688d9a97 100644 (file)
@@ -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
  */
 
 #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 );
 
 /*
  * entry_schema_check - check that entry e conforms to the schema required
@@ -34,98 +30,335 @@ static char *      oc_check_required(Entry *e, struct berval *ocname);
 
 int
 entry_schema_check( 
-       Entry *e, Attribute *oldattrs, char** text )
+       Backend *be,
+       Entry *e,
+       Attribute *oldattrs,
+       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;
+       Attribute       *a, *asc, *aoc;
+       ObjectClass *sc, *oc;
+       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( 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 );
+               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( !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 );
+
+#ifdef NEW_LOGGING
+                       LDAP_LOG( OPERATION, INFO, 
+                               "entry_schema_check: dn=\"%s\" %s\n", e->e_dn, textbuf, 0 );
 #else
-       static const char *ac_objectClass = "objectclass";
+                       Debug( LDAP_DEBUG_ANY,
+                           "Entry (%s), %s\n",
+                           e->e_dn, textbuf, 0 );
 #endif
 
+                       return LDAP_CONSTRAINT_VIOLATION;
+               }
+       }
+
+       /* it's a REALLY bad idea to disable schema checks */
        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",
+       /* find the structural object class attribute */
+       asc = attr_find( e->e_attrs, ad_structuralObjectClass );
+       if ( asc == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, INFO, 
+                       "entry_schema_check: No structuralObjectClass for entry (%s)\n", 
+                       e->e_dn, 0, 0 );
+#else
+               Debug( LDAP_DEBUG_ANY,
+                       "No structuralObjectClass for entry (%s)\n",
                    e->e_dn, 0, 0 );
+#endif
 
-               *text = "no objectclass attribute";
-               return oldattrs != NULL
-                       ? LDAP_OBJECT_CLASS_VIOLATION
-                       : LDAP_NO_OBJECT_CLASS_MODS;
+               *text = "no structuralObjectClass operational attribute";
+               return LDAP_OTHER;
        }
 
-       ret = LDAP_SUCCESS;
+       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 );
+
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, INFO, 
+                       "entry_schema_check: dn (%s), %s\n", e->e_dn, textbuf, 0 );
+#else
+               Debug( LDAP_DEBUG_ANY,
+                       "entry_check_schema(%s): %s\n",
+                       e->e_dn, textbuf, 0 );
+#endif
+
+               return LDAP_OBJECT_CLASS_VIOLATION;
+       }
+
+       if( sc->soc_kind != LDAP_SCHEMA_STRUCTURAL ) {
+               snprintf( textbuf, textlen, 
+                       "structuralObjectClass '%s' is not STRUCTURAL",
+                       asc->a_vals[0].bv_val );
+
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, INFO, 
+                       "entry_schema_check: dn (%s), %s\n", e->e_dn, textbuf, 0 );
+#else
+               Debug( LDAP_DEBUG_ANY,
+                       "entry_check_schema(%s): %s\n",
+                       e->e_dn, textbuf, 0 );
+#endif
+
+               return LDAP_OTHER;
+       }
+
+       /* find the object class attribute */
+       aoc = attr_find( e->e_attrs, ad_objectClass );
+       if ( aoc == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, INFO, 
+                       "entry_schema_check: No objectClass for entry (%s).\n", 
+                       e->e_dn, 0, 0 );
+#else
+               Debug( LDAP_DEBUG_ANY, "No objectClass for entry (%s)\n",
+                   e->e_dn, 0, 0 );
+#endif
+
+               *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 != 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;
+       }
 
        /* 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 );
+
+#ifdef NEW_LOGGING
+                       LDAP_LOG( OPERATION, INFO, 
+                               "entry_schema_check: dn (%s), %s\n", e->e_dn, textbuf, 0 );
+#else
                        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 );
+#endif
 
-               } else {
-                       char *s = oc_check_required( e, aoc->a_vals[i] );
+                       return LDAP_OBJECT_CLASS_VIOLATION;
+               }
+
+               if ( oc->soc_check ) {
+                       int rc = (oc->soc_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].bv_val; j++ ) {
+                                       if( i != j ) {
+                                               xc = oc_bvfind( &aoc->a_vals[i] );
+                                               if( xc == NULL ) {
+                                                       snprintf( textbuf, textlen, 
+                                                               "unrecognized objectClass '%s'",
+                                                               aoc->a_vals[i].bv_val );
+
+#ifdef NEW_LOGGING
+                                                       LDAP_LOG( OPERATION, INFO, 
+                                                               "entry_schema_check: dn (%s), %s\n",
+                                                               e->e_dn, textbuf, 0 );
+#else
+                                                       Debug( LDAP_DEBUG_ANY,
+                                                               "entry_check_schema(%s): %s\n",
+                                                               e->e_dn, textbuf, 0 );
+#endif
+
+                                                       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, "instanstantiation of "
+                                               "abstract objectClass '%s' not allowed",
+                                               aoc->a_vals[i].bv_val );
+
+#ifdef NEW_LOGGING
+                                       LDAP_LOG( OPERATION, INFO, 
+                                               "entry_schema_check: dn (%s), %s\n", 
+                                               e->e_dn, textbuf, 0 );
+#else
+                                       Debug( LDAP_DEBUG_ANY,
+                                               "entry_check_schema(%s): %s\n",
+                                               e->e_dn, textbuf, 0 );
+#endif
+
+                                       return LDAP_OBJECT_CLASS_VIOLATION;
+                               }
+                       }
+
+               } else if ( oc->soc_kind != LDAP_SCHEMA_STRUCTURAL || oc == sc ) {
+                       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 );
+
+#ifdef NEW_LOGGING
+                               LDAP_LOG( OPERATION, INFO, 
+                                       "entry_schema_check: dn=\"%s\" %s", e->e_dn, textbuf, 0 );
+#else
                                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 );
+#endif
+
+                               return LDAP_OBJECT_CLASS_VIOLATION;
+                       }
+
+                       if( oc == slap_schema.si_oc_extensibleObject ) {
+                               extensible=1;
                        }
                }
        }
 
-       if ( ret != LDAP_SUCCESS ) {
-           return ret;
+       if( extensible ) {
+               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;
+               int 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 );
+
+#ifdef NEW_LOGGING
+                       LDAP_LOG( OPERATION, INFO, 
+                               "entry_schema_check: dn=\"%s\" %s\n", e->e_dn, textbuf, 0);
 #else
-                       char *type = a->a_type;
-#endif
                        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 );
+#endif
+
+                       return ret;
                }
        }
 
-       return( ret );
+       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;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG( OPERATION, ENTRY, 
+               "oc_check_required: dn (%s), objectClass \"%s\"\n", 
+               e->e_dn, ocname->bv_val, 0 );
+#else
        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 );
+#endif
 
-       /* 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 +370,230 @@ 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 );
-
-       /* always allow objectclass attribute */
-       if ( strcasecmp( at->sat_cname, "objectclass" ) == 0 ) {
-               return LDAP_SUCCESS;
-       }
-
+#ifdef NEW_LOGGING
+       LDAP_LOG( OPERATION, ENTRY, 
+               "oc_check_allowed: type \"%s\"\n", at->sat_cname.bv_val, 0, 0 );
 #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;
-       }
+               "oc_check_allowed type \"%s\"\n",
+               at->sat_cname.bv_val, 0, 0 );
 #endif
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-       if( is_at_operational(at) ) {
+       /* always allow objectClass attribute */
+       if ( strcasecmp( at->sat_cname.bv_val, "objectClass" ) == 0 ) {
                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[i].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
                }
        }
 
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
-       if ( t != type )
-               ldap_memfree( t );
-#endif
+       if( scp ) {
+               *scp = sc;
+       }
 
-       /* not allowed by any oc */
-       return LDAP_OBJECT_CLASS_VIOLATION;
+       if( sc == NULL ) {
+               *text = "no structural object classes 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;
+       }
+
+       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;
+               }
+       }
+
+       if( ocmod == NULL ) {
+               *text = "entry has no objectClass attribute";
+               return LDAP_OBJECT_CLASS_VIOLATION;
+       }
+
+       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, NULL,
+               text, textbuf, textlen );
 }