X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foc.c;h=75aabb9d62235ae329c7cd5844c3a415d7c5e149;hb=1fbbc1181152a32c1b9b82342ad6d63034ec7fbb;hp=1920762bc9c5c89420be899cc07bc5e496dafcce;hpb=1086ffb438a80e867aea1a6cc00b24c7fcb7be46;p=openldap

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 1920762bc9..75aabb9d62 100644
--- 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 );
@@ -286,7 +297,12 @@ oc_add_sups(
 				&& soc1->soc_kind != LDAP_SCHEMA_ABSTRACT )
 			{
 				*err = *sups1;
-				return SLAP_SCHERR_CLASS_BAD_USAGE;
+				return SLAP_SCHERR_CLASS_BAD_SUP;
+			}
+
+			if( soc1->soc_obsolete && !soc->soc_obsolete ) {
+				*err = *sups1;
+				return SLAP_SCHERR_CLASS_BAD_SUP;
 			}
 
 			if( soc->soc_flags & SLAP_OC_OPERATIONAL ) (*op)++;
@@ -355,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);
@@ -379,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);
@@ -465,36 +479,6 @@ oc_add(
 	return code;
 }
 
-#ifdef LDAP_DEBUG
-
-static void
-oc_print( ObjectClass *oc )
-{
-	int	i;
-	const char *mid;
-
-	printf( "objectclass %s\n", ldap_objectclass2name( &oc->soc_oclass ) );
-	if ( oc->soc_required != NULL ) {
-		mid = "\trequires ";
-		for ( i = 0; oc->soc_required[i] != NULL; i++, mid = "," )
-			printf( "%s%s", mid,
-			        ldap_attributetype2name( &oc->soc_required[i]->sat_atype ) );
-		printf( "\n" );
-	}
-	if ( oc->soc_allowed != NULL ) {
-		mid = "\tallows ";
-		for ( i = 0; oc->soc_allowed[i] != NULL; i++, mid = "," )
-			printf( "%s%s", mid,
-			        ldap_attributetype2name( &oc->soc_allowed[i]->sat_atype ) );
-		printf( "\n" );
-	}
-}
-
-#endif
-
-
-#if defined( SLAPD_SCHEMA_DN )
-
 int
 oc_schema_info( Entry *e )
 {
@@ -506,20 +490,19 @@ oc_schema_info( Entry *e )
 	vals[1].bv_val = NULL;
 
 	for ( oc = oc_list; oc; oc = oc->soc_next ) {
+		if( oc->soc_flags & SLAP_OC_HIDE ) continue;
+
 		if ( ldap_objectclass2bv( &oc->soc_oclass, vals ) == NULL ) {
 			return -1;
 		}
 
-		if( oc->soc_flags & SLAP_OC_HIDE ) continue;
-
 #if 0
 		Debug( LDAP_DEBUG_TRACE, "Merging oc [%ld] %s\n",
 	       (long) vals[0].bv_len, vals[0].bv_val, 0 );
 #endif
-		attr_merge( e, ad_objectClasses, vals );
+		if( attr_merge( e, ad_objectClasses, vals ) )
+			return -1;
 		ldap_memfree( vals[0].bv_val );
 	}
 	return 0;
 }
-
-#endif