#ifdef -DSLAP_NVALUES

[openldap] / servers / slapd / oc.c

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 75aabb9d62235ae329c7cd5844c3a415d7c5e149..30c542a58241a6a563ad6ee301b65c85a1886321 100644 (file)
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -75,7 +75,7 @@ int is_entry_objectclass(
 
        if( set_flags && ( e->e_ocflags & SLAP_OC__END )) {
                /* flags are set, use them */
-               return e->e_ocflags & oc->soc_flags & SLAP_OC__MASK;
+               return (e->e_ocflags & oc->soc_flags & SLAP_OC__MASK) != 0;
        }
 
        /*
@@ -114,17 +114,18 @@ int is_entry_objectclass(
        /* mark flags as set */
        e->e_ocflags |= SLAP_OC__END;
 
-       return e->e_ocflags & oc->soc_flags & SLAP_OC__MASK;
+       return (e->e_ocflags & oc->soc_flags & SLAP_OC__MASK) != 0;
 }
 
 
 struct oindexrec {
-       struct berval   oir_name;
+       struct berval oir_name;
        ObjectClass     *oir_oc;
 };
 
 static Avlnode *oc_index = NULL;
-static ObjectClass *oc_list = NULL;
+static LDAP_SLIST_HEAD(OCList, slap_object_class) oc_list
+       = LDAP_SLIST_HEAD_INITIALIZER(&oc_list);
 
 static int
 oc_index_cmp(
@@ -331,12 +332,13 @@ oc_add_sups(
 void
 oc_destroy( void )
 {
-       ObjectClass *o, *n;
+       ObjectClass *o;
 
        avl_free(oc_index, ldap_memfree);
-       for (o=oc_list; o; o=n)
-       {
-               n = o->soc_next;
+       while( !LDAP_SLIST_EMPTY(&oc_list) ) {
+               o = LDAP_SLIST_FIRST(&oc_list);
+               LDAP_SLIST_REMOVE_HEAD(&oc_list, soc_next);
+
                if (o->soc_sups) ldap_memfree(o->soc_sups);
                if (o->soc_required) ldap_memfree(o->soc_required);
                if (o->soc_allowed) ldap_memfree(o->soc_allowed);
@@ -350,15 +352,11 @@ oc_insert(
     const char         **err
 )
 {
-       ObjectClass     **ocp;
        struct oindexrec        *oir;
        char                    **names;
 
-       ocp = &oc_list;
-       while ( *ocp != NULL ) {
-               ocp = &(*ocp)->soc_next;
-       }
-       *ocp = soc;
+       LDAP_SLIST_NEXT( soc, soc_next ) = NULL;
+       LDAP_SLIST_INSERT_HEAD( &oc_list, soc, soc_next );
 
        if ( soc->soc_oid ) {
                oir = (struct oindexrec *)
@@ -482,27 +480,30 @@ oc_add(
 int
 oc_schema_info( Entry *e )
 {
-       struct berval   vals[2];
-       ObjectClass     *oc;
-
        AttributeDescription *ad_objectClasses = slap_schema.si_ad_objectClasses;
+       ObjectClass     *oc;
+       struct berval   val;
+       struct berval   nval;
 
-       vals[1].bv_val = NULL;
-
-       for ( oc = oc_list; oc; oc = oc->soc_next ) {
+       LDAP_SLIST_FOREACH( oc, &oc_list, soc_next ) {
                if( oc->soc_flags & SLAP_OC_HIDE ) continue;
 
-               if ( ldap_objectclass2bv( &oc->soc_oclass, vals ) == NULL ) {
+               if ( ldap_objectclass2bv( &oc->soc_oclass, &val ) == NULL ) {
                        return -1;
                }
 
 #if 0
                Debug( LDAP_DEBUG_TRACE, "Merging oc [%ld] %s\n",
-              (long) vals[0].bv_len, vals[0].bv_val, 0 );
+              (long) val.bv_len, val.bv_val, 0 );
 #endif
-               if( attr_merge( e, ad_objectClasses, vals ) )
+               nval.bv_val = oc->soc_oid;
+               nval.bv_len = strlen(oc->soc_oid);
+
+               if( attr_merge_one( e, ad_objectClasses, &val, &nval ) )
+               {
                        return -1;
-               ldap_memfree( vals[0].bv_val );
+               }
+               ldap_memfree( val.bv_val );
        }
        return 0;
 }