X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foc.c;h=78ebaa7c6083cd2dc0f1ee17044e8fd446542813;hb=88e2a06b5e9c1fddd93280ffbe4dbc79c8035afb;hp=173cc82d4b389853ff5560406aad9dd806a8813b;hpb=b92710e3a5f4ca512cb26ed0180c2ace9022183d;p=openldap

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 173cc82d4b..78ebaa7c60 100644
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -1,8 +1,17 @@
 /* oc.c - object class routines */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -17,28 +26,34 @@
 #include "ldap_pvt.h"
 
 int is_object_subclass(
-	ObjectClass *sub,
-	ObjectClass *sup )
+	ObjectClass *sup,
+	ObjectClass *sub )
 {
 	int i;
 
 	if( sub == NULL || sup == NULL ) return 0;
 
 #if 0
+#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",
-		sub->soc_oid, sup->soc_oid, sup == sub );
+		sup->soc_oid, sub->soc_oid, sup == sub );
+#endif
 #endif
 
 	if( sup == sub ) {
 		return 1;
 	}
 
-	if( sup->soc_sups == NULL ) {
+	if( sub->soc_sups == NULL ) {
 		return 0;
 	}
 
-	for( i=0; sup->soc_sups[i] != NULL; i++ ) {
-		if( is_object_subclass( sub, sup->soc_sups[i] ) ) {
+	for( i=0; sub->soc_sups[i] != NULL; i++ ) {
+		if( is_object_subclass( sup, sub->soc_sups[i] ) ) {
 			return 1;
 		}
 	}
@@ -48,29 +63,41 @@ int is_object_subclass(
 
 int is_entry_objectclass(
 	Entry*	e,
-	ObjectClass *oc )
+	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;
-	int i;
+	struct berval *bv;
 	AttributeDescription *objectClass = slap_schema.si_ad_objectClass;
+
 	assert(!( e == NULL || oc == NULL ));
 
 	if( e == NULL || oc == NULL ) {
 		return 0;
 	}
 
+	if( set_flags && ( e->e_ocflags & SLAP_OC__END )) {
+		/* flags are set, use them */
+		return (e->e_ocflags & oc->soc_flags & SLAP_OC__MASK) != 0;
+	}
+
 	/*
 	 * find objectClass attribute
 	 */
 	attr = attr_find(e->e_attrs, 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",
@@ -81,46 +108,54 @@ int is_entry_objectclass(
 		return 0;
 	}
 
-	for( i=0; attr->a_vals[i]; i++ ) {
-		ObjectClass *objectClass = oc_bvfind( attr->a_vals[i] );
+	for( bv=attr->a_vals; bv->bv_val; bv++ ) {
+		ObjectClass *objectClass = oc_bvfind( bv );
 
-		if( objectClass == oc ) {
+		if ( !set_flags && objectClass == oc ) {
 			return 1;
 		}
+		
+		if ( objectClass != NULL ) {
+			e->e_ocflags |= objectClass->soc_flags;
+		}
 	}
 
-	return 0;
+	/* mark flags as set */
+	e->e_ocflags |= SLAP_OC__END;
 
+	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(
-    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;
+	if (i) return i;
 	return strcasecmp( oir1->oir_name.bv_val, oir2->oir_name.bv_val );
 }
 
 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;
+	if (i) return i;
 	return strncasecmp( name->bv_val, oir->oir_name.bv_val, name->bv_len );
 }
 
@@ -140,8 +175,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 );
@@ -154,6 +188,7 @@ static int
 oc_create_required(
     ObjectClass		*soc,
     char		**attrs,
+	int			*op,
     const char		**err )
 {
 	char		**attrs1;
@@ -169,6 +204,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;
@@ -192,6 +230,7 @@ static int
 oc_create_allowed(
     ObjectClass		*soc,
     char		**attrs,
+	int			*op,
     const char		**err )
 {
 	char		**attrs1;
@@ -205,6 +244,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) ) {
@@ -222,6 +264,7 @@ static int
 oc_add_sups(
     ObjectClass		*soc,
     char			**sups,
+	int			*op,
     const char		**err )
 {
 	int		code;
@@ -262,19 +305,27 @@ oc_add_sups(
 				&& soc1->soc_kind != LDAP_SCHEMA_ABSTRACT )
 			{
 				*err = *sups1;
-				return SLAP_SCHERR_CLASS_BAD_USAGE;
+				return SLAP_SCHERR_CLASS_BAD_SUP;
 			}
 
-			if ( add_sups )
+			if( soc1->soc_obsolete && !soc->soc_obsolete ) {
+				*err = *sups1;
+				return SLAP_SCHERR_CLASS_BAD_SUP;
+			}
+
+			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++;
@@ -288,12 +339,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);
@@ -304,18 +356,13 @@ oc_destroy( void )
 static int
 oc_insert(
     ObjectClass		*soc,
-    const char		**err
-)
+    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 *)
@@ -328,12 +375,11 @@ 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);
-			return SLAP_SCHERR_DUP_CLASS;
+			return SLAP_SCHERR_CLASS_DUP;
 		}
 
 		/* FIX: temporal consistency check */
@@ -352,12 +398,11 @@ 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);
-				return SLAP_SCHERR_DUP_CLASS;
+				return SLAP_SCHERR_CLASS_DUP;
 			}
 
 			/* FIX: temporal consistency check */
@@ -373,11 +418,12 @@ oc_insert(
 int
 oc_add(
     LDAPObjectClass	*oc,
-    const char		**err
-)
+	int user,
+    const char		**err )
 {
 	ObjectClass	*soc;
 	int		code;
+	int		op = 0;
 
 	if ( oc->oc_names != NULL ) {
 		int i;
@@ -389,85 +435,79 @@ oc_add(
 		}
 	}
 
+	if ( !OID_LEADCHAR( oc->oc_oid[0] )) {
+		/* Expand OID macros */
+		char *oid = oidm_find( oc->oc_oid );
+		if ( !oid ) {
+			*err = oc->oc_oid;
+			return SLAP_SCHERR_OIDM;
+		}
+		if ( oid != oc->oc_oid ) {
+			ldap_memfree( oc->oc_oid );
+			oc->oc_oid = oid;
+		}
+	}
+
 	soc = (ObjectClass *) ch_calloc( 1, sizeof(ObjectClass) );
 	AC_MEMCPY( &soc->soc_oclass, oc, sizeof(LDAPObjectClass) );
 
+	if( oc->oc_names != NULL ) {
+		soc->soc_cname.bv_val = soc->soc_names[0];
+	} else {
+		soc->soc_cname.bv_val = soc->soc_oid;
+	}
+	soc->soc_cname.bv_len = strlen( soc->soc_cname.bv_val );
+
 	if( soc->soc_sup_oids == NULL &&
 		soc->soc_kind == LDAP_SCHEMA_STRUCTURAL )
 	{
 		/* 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;
 }
 
-#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 )
 {
-	struct berval	val;
-	struct berval	*vals[2];
-	ObjectClass	*oc;
-
 	AttributeDescription *ad_objectClasses = slap_schema.si_ad_objectClasses;
+	ObjectClass	*oc;
+	struct berval	val;
+	struct berval	nval;
 
-	vals[0] = &val;
-	vals[1] = NULL;
+	LDAP_SLIST_FOREACH( oc, &oc_list, soc_next ) {
+		if( oc->soc_flags & SLAP_OC_HIDE ) continue;
 
-	for ( oc = oc_list; oc; oc = oc->soc_next ) {
 		if ( ldap_objectclass2bv( &oc->soc_oclass, &val ) == NULL ) {
 			return -1;
 		}
+
+		nval = oc->soc_cname;
+
 #if 0
-		Debug( LDAP_DEBUG_TRACE, "Merging oc [%ld] %s\n",
-	       (long) val.bv_len, val.bv_val, 0 );
+		Debug( LDAP_DEBUG_TRACE, "Merging oc [%ld] %s (%s)\n",
+	       (long) val.bv_len, val.bv_val, nval.bv_val );
 #endif
-		attr_merge( e, ad_objectClasses, vals );
+
+		if( attr_merge_one( e, ad_objectClasses, &val, &nval ) ) {
+			return -1;
+		}
 		ldap_memfree( val.bv_val );
 	}
 	return 0;
 }
-
-#endif