Remove lint

[openldap] / servers / slapd / oc.c

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 8c185e07e50841c32bc9635e789f5849d732d567..d245e4a0d263bc0127c70b8871a4f50e3cef0bdc 100644 (file)
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -22,6 +22,13 @@ int is_object_subclass(
 {
        int i;
 
+       if( sub == NULL || sup == NULL ) return 0;
+
+#if 0
+       Debug( LDAP_DEBUG_TRACE, "is_object_subclass(%s,%s) %d\n",
+               sub->soc_oid, sup->soc_oid, sup == sub );
+#endif
+
        if( sup == sub ) {
                return 1;
        }
@@ -31,7 +38,7 @@ int is_object_subclass(
        }
 
        for( i=0; sup->soc_sups[i] != NULL; i++ ) {
-               if( is_object_subclass( sup->soc_sups[i], sup ) ) {
+               if( is_object_subclass( sub, sup->soc_sups[i] ) ) {
                        return 1;
                }
        }
@@ -41,8 +48,7 @@ int is_object_subclass(
 
 int is_entry_objectclass(
        Entry*  e,
-       ObjectClass *oc
-)
+       ObjectClass *oc )
 {
        Attribute *attr;
        int i;
@@ -60,10 +66,17 @@ int is_entry_objectclass(
 
        if( attr == NULL ) {
                /* no objectClass attribute */
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "is_entry_objectclass: dn(%s), oid (%s), no objectlcass attribute.\n",
+                          e->e_dn == NULL ? "" : e->e_dn, oc->soc_oclass.oc_oid ));
+#else
                Debug( LDAP_DEBUG_ANY, "is_entry_objectclass(\"%s\", \"%s\") "
                        "no objectClass attribute\n",
                        e->e_dn == NULL ? "" : e->e_dn,
                        oc->soc_oclass.oc_oid, 0 );
+#endif
+
 
                return 0;
        }
@@ -81,8 +94,6 @@ int is_entry_objectclass(
 }
 
 
-
-
 struct oindexrec {
        char            *oir_name;
        ObjectClass     *oir_oc;
@@ -94,8 +105,7 @@ static ObjectClass *oc_list = NULL;
 static int
 oc_index_cmp(
     struct oindexrec   *oir1,
-    struct oindexrec   *oir2
-)
+    struct oindexrec   *oir2 )
 {
        assert( oir1->oir_name );
        assert( oir1->oir_oc );
@@ -108,8 +118,7 @@ oc_index_cmp(
 static int
 oc_index_name_cmp(
     char               *name,
-    struct oindexrec   *oir
-)
+    struct oindexrec   *oir )
 {
        assert( oir->oir_name );
        assert( oir->oir_oc );
@@ -139,8 +148,7 @@ static int
 oc_create_required(
     ObjectClass                *soc,
     char               **attrs,
-    const char         **err
-)
+    const char         **err )
 {
        char            **attrs1;
        AttributeType   *sat;
@@ -178,8 +186,7 @@ static int
 oc_create_allowed(
     ObjectClass                *soc,
     char               **attrs,
-    const char         **err
-)
+    const char         **err )
 {
        char            **attrs1;
        AttributeType   *sat;
@@ -208,30 +215,29 @@ oc_create_allowed(
 static int
 oc_add_sups(
     ObjectClass                *soc,
-    char               **sups,
-    const char         **err
-)
+    char                       **sups,
+    const char         **err )
 {
        int             code;
        ObjectClass     *soc1;
        int             nsups;
-       char            **sups1;
+       char    **sups1;
        int             add_sups = 0;
 
        if ( sups ) {
                if ( !soc->soc_sups ) {
                        /* We are at the first recursive level */
                        add_sups = 1;
-                       nsups = 0;
+                       nsups = 1;
                        sups1 = sups;
                        while ( *sups1 ) {
                                nsups++;
                                sups1++;
                        }
-                       nsups++;
                        soc->soc_sups = (ObjectClass **)ch_calloc(nsups,
                                          sizeof(ObjectClass *));
                }
+
                nsups = 0;
                sups1 = sups;
                while ( *sups1 ) {
@@ -241,24 +247,35 @@ oc_add_sups(
                                return SLAP_SCHERR_CLASS_NOT_FOUND;
                        }
 
+                       /* check object class usage
+                        * abstract classes can only sup abstract classes 
+                        * structural classes can not sup auxiliary classes
+                        * auxiliary classes can not sup structural classes
+                        */
+                       if( soc->soc_kind != soc1->soc_kind
+                               && soc1->soc_kind != LDAP_SCHEMA_ABSTRACT )
+                       {
+                               *err = *sups1;
+                               return SLAP_SCHERR_CLASS_BAD_USAGE;
+                       }
+
                        if ( add_sups )
                                soc->soc_sups[nsups] = soc1;
 
-                       code = oc_add_sups(soc,soc1->soc_sup_oids, err);
-                       if ( code )
-                               return code;
+                       code = oc_add_sups( soc, soc1->soc_sup_oids, err );
+                       if ( code ) return code;
 
-                       code = oc_create_required(soc,soc1->soc_at_oids_must,err);
-                       if ( code )
-                               return code;
-                       code = oc_create_allowed(soc,soc1->soc_at_oids_may,err);
-                       if ( code )
-                               return code;
+                       code = oc_create_required( soc, soc1->soc_at_oids_must, err );
+                       if ( code ) return code;
+
+                       code = oc_create_allowed( soc, soc1->soc_at_oids_may, err );
+                       if ( code ) return code;
 
                        nsups++;
                        sups1++;
                }
        }
+
        return 0;
 }
 
@@ -333,21 +350,44 @@ oc_insert(
 
 int
 oc_add(
-    LDAP_OBJECT_CLASS  *oc,
+    LDAPObjectClass    *oc,
     const char         **err
 )
 {
        ObjectClass     *soc;
        int             code;
 
+       if ( oc->oc_names != NULL ) {
+               int i;
+
+               for( i=0; oc->oc_names[i]; i++ ) {
+                       if( !slap_valid_descr( oc->oc_names[i] ) ) {
+                               return SLAP_SCHERR_BAD_DESCR;
+                       }
+               }
+       }
+
        soc = (ObjectClass *) ch_calloc( 1, sizeof(ObjectClass) );
-       memcpy( &soc->soc_oclass, oc, sizeof(LDAP_OBJECT_CLASS));
-       if ( (code = oc_add_sups(soc,soc->soc_sup_oids,err)) != 0 )
-               return code;
-       if ( (code = oc_create_required(soc,soc->soc_at_oids_must,err)) != 0 )
-               return code;
-       if ( (code = oc_create_allowed(soc,soc->soc_at_oids_may,err)) != 0 )
-               return code;
+       AC_MEMCPY( &soc->soc_oclass, oc, sizeof(LDAPObjectClass) );
+
+       if( soc->soc_sup_oids == NULL &&
+               soc->soc_kind == LDAP_SCHEMA_STRUCTURAL )
+       {
+               /* structural object classes implicitly inherit from 'top' */
+               static char *top_oids[] = { SLAPD_TOP_OID, NULL };
+               code = oc_add_sups( soc, top_oids, err );
+       } else {
+               code = oc_add_sups( soc, soc->soc_sup_oids, err );
+       }
+
+       if ( code != 0 ) return code;
+
+       code = oc_create_required( soc, soc->soc_at_oids_must, err );
+       if ( code != 0 ) return code;
+
+       code = oc_create_allowed( soc, soc->soc_at_oids_may, err );
+       if ( code != 0 ) return code;
+
        code = oc_insert(soc,err);
        return code;
 }