Fix LBER_ERROR vs. -1 confusion.

[openldap] / servers / slapd / oc.c

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 4ce2b8b66abf4a76aefe072a2a3da248a9e0928f..75aabb9d62235ae329c7cd5844c3a415d7c5e149 100644 (file)
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -1,7 +1,7 @@
 /* oc.c - object class routines */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -57,9 +57,16 @@ int is_entry_objectclass(
        ObjectClass *oc,
        int set_flags )
 {
+       /*
+        * set_flags should only be true if oc is one of operational
+        * object classes which we support objectClass flags for
+        * (e.g., referral, alias, ...).  See <slap.h>.
+        */
+
        Attribute *attr;
        struct berval *bv;
        AttributeDescription *objectClass = slap_schema.si_ad_objectClass;
+
        assert(!( e == NULL || oc == NULL ));
 
        if( e == NULL || oc == NULL ) {
@@ -67,14 +74,14 @@ int is_entry_objectclass(
        }
 
        if( set_flags && ( e->e_ocflags & SLAP_OC__END )) {
-               return (e->e_ocflags & oc->soc_flags) ? 1 : 0;
+               /* flags are set, use them */
+               return e->e_ocflags & oc->soc_flags & SLAP_OC__MASK;
        }
 
        /*
         * find objectClass attribute
         */
        attr = attr_find(e->e_attrs, objectClass);
-
        if( attr == NULL ) {
                /* no objectClass attribute */
 #ifdef NEW_LOGGING
@@ -95,7 +102,7 @@ int is_entry_objectclass(
        for( bv=attr->a_vals; bv->bv_val; bv++ ) {
                ObjectClass *objectClass = oc_bvfind( bv );
 
-               if ( objectClass == oc && !set_flags ) {
+               if ( !set_flags && objectClass == oc ) {
                        return 1;
                }
                
@@ -103,9 +110,11 @@ int is_entry_objectclass(
                        e->e_ocflags |= objectClass->soc_flags;
                }
        }
-       e->e_ocflags |= SLAP_OC__END;   /* We've finished this */
 
-       return (e->e_ocflags & oc->soc_flags);
+       /* mark flags as set */
+       e->e_ocflags |= SLAP_OC__END;
+
+       return e->e_ocflags & oc->soc_flags & SLAP_OC__MASK;
 }
 
 
@@ -119,9 +128,10 @@ static ObjectClass *oc_list = NULL;
 
 static int
 oc_index_cmp(
-    struct oindexrec   *oir1,
-    struct oindexrec   *oir2 )
+       const void *v_oir1,
+       const void *v_oir2 )
 {
+       const struct oindexrec *oir1 = v_oir1, *oir2 = v_oir2;
        int i = oir1->oir_name.bv_len - oir2->oir_name.bv_len;
        if (i)
                return i;
@@ -130,9 +140,11 @@ oc_index_cmp(
 
 static int
 oc_index_name_cmp(
-    struct berval      *name,
-    struct oindexrec   *oir )
+       const void *v_name,
+       const void *v_oir )
 {
+       const struct berval    *name = v_name;
+       const struct oindexrec *oir  = v_oir;
        int i = name->bv_len - oir->oir_name.bv_len;
        if (i)
                return i;
@@ -155,8 +167,7 @@ oc_bvfind( struct berval *ocname )
 {
        struct oindexrec        *oir;
 
-       oir = (struct oindexrec *) avl_find( oc_index, ocname,
-            (AVL_CMP) oc_index_name_cmp );
+       oir = avl_find( oc_index, ocname, oc_index_name_cmp );
 
        if ( oir != NULL ) {
                return( oir->oir_oc );
@@ -360,8 +371,7 @@ oc_insert(
                assert( oir->oir_oc );
 
                if ( avl_insert( &oc_index, (caddr_t) oir,
-                                (AVL_CMP) oc_index_cmp,
-                                (AVL_DUP) avl_dup_error ) )
+                                oc_index_cmp, avl_dup_error ) )
                {
                        *err = soc->soc_oid;
                        ldap_memfree(oir);
@@ -384,8 +394,7 @@ oc_insert(
                        assert( oir->oir_oc );
 
                        if ( avl_insert( &oc_index, (caddr_t) oir,
-                                        (AVL_CMP) oc_index_cmp,
-                                        (AVL_DUP) avl_dup_error ) )
+                                        oc_index_cmp, avl_dup_error ) )
                        {
                                *err = *names;
                                ldap_memfree(oir);