X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foc.c;h=c2ba69013df2c18d05162c54a4d27a1fecd2466a;hb=f8fb4aca7668c722f41941be719203aa8c298e12;hp=8c185e07e50841c32bc9635e789f5849d732d567;hpb=c3f8de76ef3600d9d21f828e2073c09d4612f0f8;p=openldap

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 8c185e07e5..c2ba69013d 100644
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -1,7 +1,7 @@
 /* oc.c - object class routines */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -22,6 +22,13 @@ int is_object_subclass(
 {
 	int i;
 
+	if( sub == NULL || sup == NULL ) return 0;
+
+#if 0
+	Debug( LDAP_DEBUG_TRACE, "is_object_subclass(%s,%s) %d\n",
+		sub->soc_oid, sup->soc_oid, sup == sub );
+#endif
+
 	if( sup == sub ) {
 		return 1;
 	}
@@ -31,7 +38,7 @@ int is_object_subclass(
 	}
 
 	for( i=0; sup->soc_sups[i] != NULL; i++ ) {
-		if( is_object_subclass( sup->soc_sups[i], sup ) ) {
+		if( is_object_subclass( sub, sup->soc_sups[i] ) ) {
 			return 1;
 		}
 	}
@@ -41,11 +48,10 @@ int is_object_subclass(
 
 int is_entry_objectclass(
 	Entry*	e,
-	ObjectClass *oc
-)
+	ObjectClass *oc )
 {
 	Attribute *attr;
-	int i;
+	struct berval *bv;
 	AttributeDescription *objectClass = slap_schema.si_ad_objectClass;
 	assert(!( e == NULL || oc == NULL ));
 
@@ -60,16 +66,23 @@ 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 ));
+#else
 		Debug( LDAP_DEBUG_ANY, "is_entry_objectclass(\"%s\", \"%s\") "
 			"no objectClass attribute\n",
 			e->e_dn == NULL ? "" : e->e_dn,
 			oc->soc_oclass.oc_oid, 0 );
+#endif
 
 		return 0;
 	}
 
-	for( i=0; attr->a_vals[i]; i++ ) {
-		ObjectClass *objectClass = oc_find( attr->a_vals[i]->bv_val );
+	for( bv=attr->a_vals; bv->bv_val; bv++ ) {
+		ObjectClass *objectClass = oc_bvfind( bv );
 
 		if( objectClass == oc ) {
 			return 1;
@@ -81,10 +94,8 @@ int is_entry_objectclass(
 }
 
 
-
-
 struct oindexrec {
-	char		*oir_name;
+	struct berval	oir_name;
 	ObjectClass	*oir_oc;
 };
 
@@ -94,31 +105,38 @@ static ObjectClass *oc_list = NULL;
 static int
 oc_index_cmp(
     struct oindexrec	*oir1,
-    struct oindexrec	*oir2
-)
+    struct oindexrec	*oir2 )
 {
-	assert( oir1->oir_name );
-	assert( oir1->oir_oc );
-	assert( oir2->oir_name );
-	assert( oir2->oir_oc );
-
-	return (strcasecmp( oir1->oir_name, oir2->oir_name ));
+	int i = oir1->oir_name.bv_len - oir2->oir_name.bv_len;
+	if (i)
+		return i;
+	return strcasecmp( oir1->oir_name.bv_val, oir2->oir_name.bv_val );
 }
 
 static int
 oc_index_name_cmp(
-    char 		*name,
-    struct oindexrec	*oir
-)
+    struct berval	*name,
+    struct oindexrec	*oir )
 {
-	assert( oir->oir_name );
-	assert( oir->oir_oc );
-
-	return (strcasecmp( name, oir->oir_name ));
+	int i = name->bv_len - oir->oir_name.bv_len;
+	if (i)
+		return i;
+	return strncasecmp( name->bv_val, oir->oir_name.bv_val, name->bv_len );
 }
 
 ObjectClass *
 oc_find( const char *ocname )
+{
+	struct berval bv;
+
+	bv.bv_val = (char *)ocname;
+	bv.bv_len = strlen( ocname );
+
+	return( oc_bvfind( &bv ) );
+}
+
+ObjectClass *
+oc_bvfind( struct berval *ocname )
 {
 	struct oindexrec	*oir;
 
@@ -126,9 +144,6 @@ oc_find( const char *ocname )
             (AVL_CMP) oc_index_name_cmp );
 
 	if ( oir != NULL ) {
-		assert( oir->oir_name );
-		assert( oir->oir_oc );
-
 		return( oir->oir_oc );
 	}
 
@@ -139,8 +154,7 @@ static int
 oc_create_required(
     ObjectClass		*soc,
     char		**attrs,
-    const char		**err
-)
+    const char		**err )
 {
 	char		**attrs1;
 	AttributeType	*sat;
@@ -178,8 +192,7 @@ static int
 oc_create_allowed(
     ObjectClass		*soc,
     char		**attrs,
-    const char		**err
-)
+    const char		**err )
 {
 	char		**attrs1;
 	AttributeType	*sat;
@@ -208,30 +221,29 @@ oc_create_allowed(
 static int
 oc_add_sups(
     ObjectClass		*soc,
-    char		**sups,
-    const char		**err
-)
+    char			**sups,
+    const char		**err )
 {
 	int		code;
 	ObjectClass	*soc1;
 	int		nsups;
-	char		**sups1;
+	char	**sups1;
 	int		add_sups = 0;
 
 	if ( sups ) {
 		if ( !soc->soc_sups ) {
 			/* We are at the first recursive level */
 			add_sups = 1;
-			nsups = 0;
+			nsups = 1;
 			sups1 = sups;
 			while ( *sups1 ) {
 				nsups++;
 				sups1++;
 			}
-			nsups++;
 			soc->soc_sups = (ObjectClass **)ch_calloc(nsups,
 					  sizeof(ObjectClass *));
 		}
+
 		nsups = 0;
 		sups1 = sups;
 		while ( *sups1 ) {
@@ -241,27 +253,54 @@ oc_add_sups(
 				return SLAP_SCHERR_CLASS_NOT_FOUND;
 			}
 
+			/* check object class usage
+			 * abstract classes can only sup abstract classes 
+			 * structural classes can not sup auxiliary classes
+			 * auxiliary classes can not sup structural classes
+			 */
+			if( soc->soc_kind != soc1->soc_kind
+				&& soc1->soc_kind != LDAP_SCHEMA_ABSTRACT )
+			{
+				*err = *sups1;
+				return SLAP_SCHERR_CLASS_BAD_USAGE;
+			}
+
 			if ( add_sups )
 				soc->soc_sups[nsups] = soc1;
 
-			code = oc_add_sups(soc,soc1->soc_sup_oids, err);
-			if ( code )
-				return code;
+			code = oc_add_sups( soc, soc1->soc_sup_oids, err );
+			if ( code ) return code;
 
-			code = oc_create_required(soc,soc1->soc_at_oids_must,err);
-			if ( code )
-				return code;
-			code = oc_create_allowed(soc,soc1->soc_at_oids_may,err);
-			if ( code )
-				return code;
+			code = oc_create_required( soc, soc1->soc_at_oids_must, err );
+			if ( code ) return code;
+
+			code = oc_create_allowed( soc, soc1->soc_at_oids_may, err );
+			if ( code ) return code;
 
 			nsups++;
 			sups1++;
 		}
 	}
+
 	return 0;
 }
 
+void
+oc_destroy( void )
+{
+	ObjectClass *o, *n;
+
+	avl_free(oc_index, ldap_memfree);
+	for (o=oc_list; o; o=n)
+	{
+		n = o->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);
+		ldap_objectclass_free((LDAPObjectClass *)o);
+	}
+}
+
 static int
 oc_insert(
     ObjectClass		*soc,
@@ -281,10 +320,11 @@ oc_insert(
 	if ( soc->soc_oid ) {
 		oir = (struct oindexrec *)
 			ch_calloc( 1, sizeof(struct oindexrec) );
-		oir->oir_name = soc->soc_oid;
+		oir->oir_name.bv_val = soc->soc_oid;
+		oir->oir_name.bv_len = strlen( soc->soc_oid );
 		oir->oir_oc = soc;
 
-		assert( oir->oir_name );
+		assert( oir->oir_name.bv_val );
 		assert( oir->oir_oc );
 
 		if ( avl_insert( &oc_index, (caddr_t) oir,
@@ -292,23 +332,23 @@ oc_insert(
 				 (AVL_DUP) avl_dup_error ) )
 		{
 			*err = soc->soc_oid;
-			ldap_memfree(oir->oir_name);
 			ldap_memfree(oir);
 			return SLAP_SCHERR_DUP_CLASS;
 		}
 
 		/* FIX: temporal consistency check */
-		assert( oc_find(oir->oir_name) != NULL );
+		assert( oc_bvfind(&oir->oir_name) != NULL );
 	}
 
 	if ( (names = soc->soc_names) ) {
 		while ( *names ) {
 			oir = (struct oindexrec *)
 				ch_calloc( 1, sizeof(struct oindexrec) );
-			oir->oir_name = ch_strdup(*names);
+			oir->oir_name.bv_val = *names;
+			oir->oir_name.bv_len = strlen( *names );
 			oir->oir_oc = soc;
 
-			assert( oir->oir_name );
+			assert( oir->oir_name.bv_val );
 			assert( oir->oir_oc );
 
 			if ( avl_insert( &oc_index, (caddr_t) oir,
@@ -316,13 +356,12 @@ oc_insert(
 					 (AVL_DUP) avl_dup_error ) )
 			{
 				*err = *names;
-				ldap_memfree(oir->oir_name);
 				ldap_memfree(oir);
 				return SLAP_SCHERR_DUP_CLASS;
 			}
 
 			/* FIX: temporal consistency check */
-			assert( oc_find(oir->oir_name) != NULL );
+			assert( oc_bvfind(&oir->oir_name) != NULL );
 
 			names++;
 		}
@@ -333,21 +372,57 @@ oc_insert(
 
 int
 oc_add(
-    LDAP_OBJECT_CLASS	*oc,
+    LDAPObjectClass	*oc,
     const char		**err
 )
 {
 	ObjectClass	*soc;
 	int		code;
 
+	if ( oc->oc_names != NULL ) {
+		int i;
+
+		for( i=0; oc->oc_names[i]; i++ ) {
+			if( !slap_valid_descr( oc->oc_names[i] ) ) {
+				return SLAP_SCHERR_BAD_DESCR;
+			}
+		}
+	}
+
+	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) );
-	memcpy( &soc->soc_oclass, oc, sizeof(LDAP_OBJECT_CLASS));
-	if ( (code = oc_add_sups(soc,soc->soc_sup_oids,err)) != 0 )
-		return code;
-	if ( (code = oc_create_required(soc,soc->soc_at_oids_must,err)) != 0 )
-		return code;
-	if ( (code = oc_create_allowed(soc,soc->soc_at_oids_may,err)) != 0 )
-		return code;
+	AC_MEMCPY( &soc->soc_oclass, oc, sizeof(LDAPObjectClass) );
+
+	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 );
+	} else {
+		code = oc_add_sups( soc, soc->soc_sup_oids, err );
+	}
+
+	if ( code != 0 ) return code;
+
+	code = oc_create_required( soc, soc->soc_at_oids_must, err );
+	if ( code != 0 ) return code;
+
+	code = oc_create_allowed( soc, soc->soc_at_oids_may, err );
+	if ( code != 0 ) return code;
+
 	code = oc_insert(soc,err);
 	return code;
 }
@@ -385,27 +460,23 @@ oc_print( ObjectClass *oc )
 int
 oc_schema_info( Entry *e )
 {
-	struct berval	val;
-	struct berval	*vals[2];
+	struct berval	vals[2];
 	ObjectClass	*oc;
 
 	AttributeDescription *ad_objectClasses = slap_schema.si_ad_objectClasses;
 
-	vals[0] = &val;
-	vals[1] = NULL;
+	vals[1].bv_val = NULL;
 
 	for ( oc = oc_list; oc; oc = oc->soc_next ) {
-		val.bv_val = ldap_objectclass2str( &oc->soc_oclass );
-		if ( val.bv_val == NULL ) {
+		if ( ldap_objectclass2bv( &oc->soc_oclass, vals ) == NULL ) {
 			return -1;
 		}
-		val.bv_len = strlen( val.bv_val );
 #if 0
 		Debug( LDAP_DEBUG_TRACE, "Merging oc [%ld] %s\n",
-	       (long) val.bv_len, val.bv_val, 0 );
+	       (long) vals[0].bv_len, vals[0].bv_val, 0 );
 #endif
 		attr_merge( e, ad_objectClasses, vals );
-		ldap_memfree( val.bv_val );
+		ldap_memfree( vals[0].bv_val );
 	}
 	return 0;
 }