Experiment with busy loop protection...

[openldap] / servers / slapd / oc.c

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 5ecb0e73e534c1828a15553124ed93dc37b4e67a..6fce72d924206a895cd64698969a7e6a2e4b42cd 100644 (file)
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -67,9 +67,10 @@ 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 ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR, "is_entry_objectclass: "
+                       "dn(%s), oid (%s), no objectClass 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",
@@ -77,7 +78,6 @@ int is_entry_objectclass(
                        oc->soc_oclass.oc_oid, 0 );
 #endif
 
-
                return 0;
        }
 
@@ -112,7 +112,7 @@ oc_index_cmp(
        assert( oir2->oir_name );
        assert( oir2->oir_oc );
 
-       return (strcasecmp( oir1->oir_name, oir2->oir_name ));
+       return strcasecmp( oir1->oir_name, oir2->oir_name );
 }
 
 static int
@@ -357,6 +357,16 @@ oc_add(
        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) );
        AC_MEMCPY( &soc->soc_oclass, oc, sizeof(LDAPObjectClass) );