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

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 73cf9eac25..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
  */
 
@@ -51,7 +51,7 @@ int is_entry_objectclass(
 	ObjectClass *oc )
 {
 	Attribute *attr;
-	int i;
+	struct berval *bv;
 	AttributeDescription *objectClass = slap_schema.si_ad_objectClass;
 	assert(!( e == NULL || oc == NULL ));
 
@@ -81,8 +81,8 @@ 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 ) {
 			return 1;
@@ -294,9 +294,9 @@ oc_destroy( void )
 	for (o=oc_list; o; o=n)
 	{
 		n = o->soc_next;
-		ldap_memfree(o->soc_sups);
-		ldap_memfree(o->soc_required);
-		ldap_memfree(o->soc_allowed);
+		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);
 	}
 }
@@ -389,6 +389,19 @@ 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) );
 
@@ -447,25 +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 ) {
-		if ( ldap_objectclass2bv( &oc->soc_oclass, &val ) == NULL ) {
+		if ( ldap_objectclass2bv( &oc->soc_oclass, vals ) == NULL ) {
 			return -1;
 		}
 #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;
 }