]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/schema_check.c
fix possible uninitialized use of nmods
[openldap] / servers / slapd / schema_check.c
index 1f1ed839fe7bcb4fb32e1f14a2ed21ccb5d8dbf0..31c16e2f2d58747c6c8fe4f70e183de4df065151 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
  */
 
@@ -21,85 +21,6 @@ static char * oc_check_required(
        ObjectClass *oc,
        struct berval *ocname );
 
-/*
- * Determine the structural object class from a set of OIDs
- */
-int structural_class(
-       struct berval **ocs,
-       struct berval *scbv,
-       const char **text )
-{
-       int i;
-       ObjectClass *oc;
-       ObjectClass *sc = NULL;
-       int scn = 0;
-
-       *text = "structural_class: internal error";
-       scbv->bv_len = 0;
-
-       for( i=0; ocs[i]; i++ ) {
-               oc = oc_find( ocs[i]->bv_val );
-
-               if( oc == NULL ) {
-                       *text = "unrecongized objectClass attribute";
-                       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 ) ) {
-                               /* FIXME: multiple inheritance possible! */
-                               *text = "invalid strucutural object class chain";
-                               return LDAP_OBJECT_CLASS_VIOLATION;
-                       }
-               }
-       }
-
-       if( sc == NULL ) {
-               *text = "no strucutural object classes";
-               return LDAP_OBJECT_CLASS_VIOLATION;
-       }
-
-       *scbv = *ocs[scn];
-       return LDAP_SUCCESS;
-}
-
-/*
- * Return structural object class from list of modifications
- */
-int mods_structural_class(
-       Modifications *mods,
-       struct berval *sc,
-       const char **text )
-{
-       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] == NULL ) {
-               *text = "objectClass attribute has no values";
-               return LDAP_OBJECT_CLASS_VIOLATION;
-       }
-
-       return structural_class( ocmod->sml_bvalues, sc, text );
-}
-
 /*
  * entry_schema_check - check that entry e conforms to the schema required
  * by its object class(es).
@@ -109,12 +30,18 @@ int mods_structural_class(
 
 int
 entry_schema_check( 
-       Entry *e, Attribute *oldattrs,
+       Backend *be,
+       Entry *e,
+       Attribute *oldattrs,
        const char** text,
        char *textbuf, size_t textlen )
 {
        Attribute       *a, *asc, *aoc;
        ObjectClass *sc, *oc;
+#ifdef SLAP_EXTENDED_SCHEMA
+       AttributeType *at;
+       ContentRule *cr;
+#endif
        int     rc, i;
        struct berval nsc;
        AttributeDescription *ad_structuralObjectClass
@@ -122,29 +49,49 @@ entry_schema_check(
        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;
 
-       /* 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( !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] != 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 );
 
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "schema", LDAP_LEVEL_INFO,
-                               "entry_schema_check: dn=\"%s\" %s\n",
-                               e->e_dn, textbuf ));
+                       LDAP_LOG( OPERATION, INFO, 
+                               "entry_schema_check: dn=\"%s\" %s\n", e->e_dn, textbuf, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                            "Entry (%s), %s\n",
@@ -155,15 +102,16 @@ entry_schema_check(
                }
        }
 
+       /* 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 */
+       /* find the structural object class attribute */
        asc = attr_find( e->e_attrs, ad_structuralObjectClass );
        if ( asc == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "schema", LDAP_LEVEL_INFO, "entry_schema_check: "
-                       "No structuralObjectClass for entry (%s)\n",
-                       e->e_dn ));
+               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",
@@ -171,23 +119,22 @@ entry_schema_check(
 #endif
 
                *text = "no structuralObjectClass operational attribute";
-               return LDAP_OBJECT_CLASS_VIOLATION;
+               return LDAP_OTHER;
        }
 
        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,
-                       "entry_schema_check: dn (%s), %s\n",
-                       e->e_dn, textbuf ));
+               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",
@@ -200,12 +147,28 @@ 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( 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;
+       }
+
+       if( sc->soc_obsolete ) {
+               snprintf( textbuf, textlen, 
+                       "structuralObjectClass '%s' is OBSOLETE",
+                       asc->a_vals[0].bv_val );
 
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "schema", LDAP_LEVEL_INFO,
-                       "entry_schema_check: dn (%s), %s\n",
-                       e->e_dn, textbuf ));
+               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",
@@ -219,8 +182,9 @@ entry_schema_check(
        aoc = attr_find( e->e_attrs, ad_objectClass );
        if ( aoc == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "schema", LDAP_LEVEL_INFO,
-                       "entry_schema_check: No objectClass for entry (%s).\n", e->e_dn ));
+               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 );
@@ -231,70 +195,270 @@ 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 );
+       rc = structural_class( aoc->a_vals, &nsc, &oc, text, textbuf, textlen );
        if( rc != LDAP_SUCCESS ) {
                return rc;
-       } else if ( nsc.bv_len == 0 ) {
-               return LDAP_OBJECT_CLASS_VIOLATION;
        }
 
        *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 );
+                       "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;
        }
 
+#ifdef SLAP_EXTENDED_SCHEMA
+       /* 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( cr->scr_obsolete ) {
+                       snprintf( textbuf, textlen, 
+                               "content rule '%s' is obsolete",
+                               ldap_contentrule2name( &cr->scr_crule ));
+
+#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): %s\n",
+                               e->e_dn, textbuf, 0 );
+#endif
+
+                       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 );
+
+#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): %s\n",
+                                       e->e_dn, textbuf, 0 );
+#endif
+
+                               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 );
+
+#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): %s\n",
+                                       e->e_dn, textbuf, 0 );
+#endif
+
+                               return LDAP_OBJECT_CLASS_VIOLATION;
+                       }
+               }
+       }
+#endif /* SLAP_EXTENDED_SCHEMA */
+
        /* 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,
-                               "entry_schema_check: dn (%s), %s\n",
-                               e->e_dn, textbuf ));
+                       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\" not recognized\n",
+                               "entry_check_schema(%s): %s\n",
                                e->e_dn, textbuf, 0 );
 #endif
 
                        return LDAP_OBJECT_CLASS_VIOLATION;
+               }
+
+               if ( oc->soc_obsolete ) {
+                       /* disallow obsolete classes */
+                       snprintf( textbuf, textlen, 
+                               "objectClass '%s' is OBSOLETE",
+                               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
 
-               } else if ( oc->soc_kind == LDAP_SCHEMA_ABSTRACT ) {
+                       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 */
-                       /* FIXME: need to check that is is a superclass of something */
+                       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
 
-               } else if ( oc->soc_kind == LDAP_SCHEMA_STRUCTURAL && oc != sc ) {
-                       /* object class is a superclass of the structural class */
-                       /* nothing in particular to check */
+                                       return LDAP_OBJECT_CLASS_VIOLATION;
+                               }
+                       }
 
-               } else {
-                       char *s = oc_check_required( e, oc, aoc->a_vals[i] );
+               } else if ( oc->soc_kind != LDAP_SCHEMA_STRUCTURAL || oc == sc ) {
+                       char *s;
+
+#ifdef SLAP_EXTENDED_SCHEMA
+                       if( oc->soc_kind == LDAP_SCHEMA_AUXILIARY ) {
+                               int k=0;
+                               if( cr ) {
+                                       if( cr->scr_auxiliaries ) {
+                                               for( ; cr->scr_auxiliaries[k]; k++ ) {
+                                                       if( cr->scr_auxiliaries[k] == oc ) {
+                                                               k=-1;
+                                                               break;
+                                                       }
+                                               }
+                                       }
+                               } else if ( global_disallows & SLAP_DISALLOW_AUX_WO_CR ) {
+                                       k=-1;
+                               }
 
+                               if( k == -1 ) {
+                                       snprintf( textbuf, textlen, 
+                                               "content rule '%s' does not allow class '%s'",
+                                               ldap_contentrule2name( &cr->scr_crule ),
+                                               oc->soc_cname.bv_val );
+
+#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): %s\n",
+                                               e->e_dn, textbuf, 0 );
+#endif
+
+                                       return LDAP_OBJECT_CLASS_VIOLATION;
+                               }
+                       }
+#endif /* SLAP_EXTENDED_SCHEMA */
+
+                       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,
-                                       "entry_schema_check: dn=\"%s\" %s",
-                                       e->e_dn, textbuf ));
+                               LDAP_LOG( OPERATION, INFO, 
+                                       "entry_schema_check: dn=\"%s\" %s", e->e_dn, textbuf, 0 );
 #else
                                Debug( LDAP_DEBUG_ANY,
                                        "Entry (%s): %s\n",
@@ -316,7 +480,35 @@ entry_schema_check(
 
        /* check that each attr in the entry is allowed by some oc */
        for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
-               int ret = oc_check_allowed( a->a_desc->ad_type, aoc->a_vals );
+               int ret;
+
+#ifdef SLAP_EXTENDED_SCHEMA
+               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 ) 
+#endif /* SLAP_EXTENDED_SCHEMA */
+               {
+                       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;
 
@@ -325,9 +517,8 @@ entry_schema_check(
                                type );
 
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "schema", LDAP_LEVEL_INFO,
-                               "entry_schema_check: dn=\"%s\" %s\n",
-                               e->e_dn, textbuf ));
+                       LDAP_LOG( OPERATION, INFO, 
+                               "entry_schema_check: dn=\"%s\" %s\n", e->e_dn, textbuf, 0);
 #else
                        Debug( LDAP_DEBUG_ANY,
                            "Entry (%s), %s\n",
@@ -352,9 +543,9 @@ oc_check_required(
        Attribute       *a;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
-               "oc_check_required: dn (%s), objectClass \"%s\"\n",
-       e->e_dn, ocname->bv_val ));
+       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",
@@ -387,14 +578,14 @@ oc_check_required(
 
 int oc_check_allowed(
        AttributeType *at,
-       struct berval **ocl )
+       BerVarray ocl,
+       ObjectClass *sc )
 {
-       ObjectClass     *oc;
        int             i, j;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
-               "oc_check_allowed: type \"%s\"\n", at->sat_cname.bv_val ));
+       LDAP_LOG( OPERATION, ENTRY, 
+               "oc_check_allowed: type \"%s\"\n", at->sat_cname.bv_val, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE,
                "oc_check_allowed type \"%s\"\n",
@@ -413,10 +604,34 @@ int oc_check_allowed(
                return LDAP_SUCCESS;
        }
 
+       /* 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++ )
@@ -433,10 +648,145 @@ int oc_check_allowed(
                                        return LDAP_SUCCESS;
                                }
                        }
-                       /* maybe the next oc allows it */
                }
        }
 
        /* 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;
+                                       }
+
+                                       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;
+                               }
+                       }
+               }
+       }
+
+       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;
+       }
+
+       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 );
+}