Experimental code that uses one locker ID per thread. Seems to work OK,

[openldap] / servers / slapd / oc.c

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 4e0adde93aa24109668961f5ee61c7955f1e0f8d..2d7c6ce097274af7dd4b5327a207e25eab7ddd23 100644 (file)
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -25,8 +25,14 @@ int is_object_subclass(
        if( sub == NULL || sup == NULL ) return 0;
 
 #if 1
+#ifdef NEW_LOGGING
+       LDAP_LOG ( OPERATION, ARGS, 
+               "is_object_subclass(%s,%s) %d\n",
+               sup->soc_oid, sub->soc_oid, sup == sub );
+#else
        Debug( LDAP_DEBUG_TRACE, "is_object_subclass(%s,%s) %d\n",
                sup->soc_oid, sub->soc_oid, sup == sub );
+#endif
 #endif
 
        if( sup == sub ) {
@@ -72,10 +78,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 objectClass attribute.\n",
-                       e->e_dn == NULL ? "" : e->e_dn,
-                       oc->soc_oclass.oc_oid ));
+               LDAP_LOG( OPERATION, ERR, 
+                       "is_entry_objectclass: dn(%s), oid (%s), no objectClass "
+                       "attribute.\n", e->e_dn == NULL ? "" : e->e_dn,
+                       oc->soc_oclass.oc_oid, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "is_entry_objectclass(\"%s\", \"%s\") "
                        "no objectClass attribute\n",
@@ -163,6 +169,7 @@ static int
 oc_create_required(
     ObjectClass                *soc,
     char               **attrs,
+       int                     *op,
     const char         **err )
 {
        char            **attrs1;
@@ -178,6 +185,9 @@ oc_create_required(
                                *err = *attrs1;
                                return SLAP_SCHERR_ATTR_NOT_FOUND;
                        }
+
+                       if( is_at_operational( sat )) (*op)++;
+
                        if ( at_find_in_list(sat, soc->soc_required) < 0) {
                                if ( at_append_to_list(sat, &soc->soc_required) ) {
                                        *err = *attrs1;
@@ -201,6 +211,7 @@ static int
 oc_create_allowed(
     ObjectClass                *soc,
     char               **attrs,
+       int                     *op,
     const char         **err )
 {
        char            **attrs1;
@@ -214,6 +225,9 @@ oc_create_allowed(
                                *err = *attrs1;
                                return SLAP_SCHERR_ATTR_NOT_FOUND;
                        }
+
+                       if( is_at_operational( sat )) (*op)++;
+
                        if ( at_find_in_list(sat, soc->soc_required) < 0 &&
                             at_find_in_list(sat, soc->soc_allowed) < 0 ) {
                                if ( at_append_to_list(sat, &soc->soc_allowed) ) {
@@ -231,6 +245,7 @@ static int
 oc_add_sups(
     ObjectClass                *soc,
     char                       **sups,
+       int                     *op,
     const char         **err )
 {
        int             code;
@@ -274,16 +289,19 @@ oc_add_sups(
                                return SLAP_SCHERR_CLASS_BAD_USAGE;
                        }
 
-                       if ( add_sups )
+                       if( soc->soc_flags & SLAP_OC_OPERATIONAL ) (*op)++;
+
+                       if ( add_sups ) {
                                soc->soc_sups[nsups] = soc1;
+                       }
 
-                       code = oc_add_sups( soc, soc1->soc_sup_oids, err );
+                       code = oc_add_sups( soc, soc1->soc_sup_oids, op, err );
                        if ( code ) return code;
 
-                       code = oc_create_required( soc, soc1->soc_at_oids_must, err );
+                       code = oc_create_required( soc, soc1->soc_at_oids_must, op, err );
                        if ( code ) return code;
 
-                       code = oc_create_allowed( soc, soc1->soc_at_oids_may, err );
+                       code = oc_create_allowed( soc, soc1->soc_at_oids_may, op, err );
                        if ( code ) return code;
 
                        nsups++;
@@ -342,7 +360,7 @@ oc_insert(
                {
                        *err = soc->soc_oid;
                        ldap_memfree(oir);
-                       return SLAP_SCHERR_DUP_CLASS;
+                       return SLAP_SCHERR_CLASS_DUP;
                }
 
                /* FIX: temporal consistency check */
@@ -366,7 +384,7 @@ oc_insert(
                        {
                                *err = *names;
                                ldap_memfree(oir);
-                               return SLAP_SCHERR_DUP_CLASS;
+                               return SLAP_SCHERR_CLASS_DUP;
                        }
 
                        /* FIX: temporal consistency check */
@@ -382,11 +400,13 @@ oc_insert(
 int
 oc_add(
     LDAPObjectClass    *oc,
+       int user,
     const char         **err
 )
 {
        ObjectClass     *soc;
        int             code;
+       int             op = 0;
 
        if ( oc->oc_names != NULL ) {
                int i;
@@ -419,19 +439,21 @@ oc_add(
        {
                /* structural object classes implicitly inherit from 'top' */
                static char *top_oids[] = { SLAPD_TOP_OID, NULL };
-               code = oc_add_sups( soc, top_oids, err );
+               code = oc_add_sups( soc, top_oids, &op, err );
        } else {
-               code = oc_add_sups( soc, soc->soc_sup_oids, err );
+               code = oc_add_sups( soc, soc->soc_sup_oids, &op, err );
        }
 
        if ( code != 0 ) return code;
 
-       code = oc_create_required( soc, soc->soc_at_oids_must, err );
+       code = oc_create_required( soc, soc->soc_at_oids_must, &op, err );
        if ( code != 0 ) return code;
 
-       code = oc_create_allowed( soc, soc->soc_at_oids_may, err );
+       code = oc_create_allowed( soc, soc->soc_at_oids_may, &op, err );
        if ( code != 0 ) return code;
 
+       if( user && op ) return SLAP_SCHERR_CLASS_BAD_SUP;
+
        code = oc_insert(soc,err);
        return code;
 }