/* 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
*/
if( sub == NULL || sup == NULL ) return 0;
#if 1
+#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",
sup->soc_oid, sub->soc_oid, sup == sub );
+#endif
#endif
if( sup == sub ) {
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 ) {
}
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) != 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",
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;
}
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) != 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;
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;
{
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 );
&& 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)++;
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);
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 *)
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 */
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 */
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 )
{
code = oc_create_allowed( soc, soc->soc_at_oids_may, &op, err );
if ( code != 0 ) return code;
- if( user && op ) return SLAP_SCHERR_CLASS_OPERATIONAL;
+ 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 vals[2];
- ObjectClass *oc;
-
AttributeDescription *ad_objectClasses = slap_schema.si_ad_objectClasses;
+ ObjectClass *oc;
+ struct berval val;
+ struct berval nval;
- vals[1].bv_val = 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, vals ) == NULL ) {
+ if ( ldap_objectclass2bv( &oc->soc_oclass, &val ) == 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 );
+ (long) val.bv_len, val.bv_val, 0 );
#endif
- attr_merge( e, ad_objectClasses, vals );
- ldap_memfree( vals[0].bv_val );
+ nval.bv_val = oc->soc_oid;
+ nval.bv_len = strlen(oc->soc_oid);
+
+ if( attr_merge_one( e, ad_objectClasses, &val, &nval ) )
+ {
+ return -1;
+ }
+ ldap_memfree( val.bv_val );
}
return 0;
}
-
-#endif