/* 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
*/
#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
+#if 1
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
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;
}
}
int is_entry_objectclass(
Entry* e,
- ObjectClass *oc )
+ ObjectClass *oc,
+ int set_flags )
{
Attribute *attr;
- int i;
+ struct berval *bv;
AttributeDescription *objectClass = slap_schema.si_ad_objectClass;
assert(!( e == NULL || oc == NULL ));
return 0;
}
+ if( set_flags && ( e->e_ocflags & SLAP_OC__END )) {
+ return (e->e_ocflags & oc->soc_flags) ? 1 : 0;
+ }
+
/*
* find objectClass attribute
*/
if( attr == NULL ) {
/* no objectClass attribute */
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "is_entry_objectclass: dn(%s), oid (%s), no objectlcass attribute.\n",
- e->e_dn == NULL ? "" : e->e_dn, oc->soc_oclass.oc_oid ));
+ 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",
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 ) {
+ if ( objectClass == oc && !set_flags ) {
return 1;
}
+
+ if ( objectClass != NULL ) {
+ e->e_ocflags |= objectClass->soc_flags;
+ }
}
+ e->e_ocflags |= SLAP_OC__END; /* We've finished this */
- return 0;
-
+ return (e->e_ocflags & oc->soc_flags);
}
struct oindexrec {
- char *oir_name;
+ struct berval oir_name;
ObjectClass *oir_oc;
};
struct oindexrec *oir1,
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 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;
(AVL_CMP) oc_index_name_cmp );
if ( oir != NULL ) {
- assert( oir->oir_name );
- assert( oir->oir_oc );
-
return( oir->oir_oc );
}
oc_create_required(
ObjectClass *soc,
char **attrs,
+ int *op,
const char **err )
{
char **attrs1;
*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;
oc_create_allowed(
ObjectClass *soc,
char **attrs,
+ int *op,
const char **err )
{
char **attrs1;
*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) ) {
oc_add_sups(
ObjectClass *soc,
char **sups,
+ int *op,
const char **err )
{
int code;
return SLAP_SCHERR_CLASS_BAD_USAGE;
}
- if ( add_sups )
+ 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++;
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,
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,
(AVL_DUP) avl_dup_error ) )
{
*err = soc->soc_oid;
- ldap_memfree(oir->oir_name);
ldap_memfree(oir);
- return SLAP_SCHERR_DUP_CLASS;
+ return SLAP_SCHERR_CLASS_DUP;
}
/* 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,
(AVL_DUP) avl_dup_error ) )
{
*err = *names;
- ldap_memfree(oir->oir_name);
ldap_memfree(oir);
- return SLAP_SCHERR_DUP_CLASS;
+ return SLAP_SCHERR_CLASS_DUP;
}
/* FIX: temporal consistency check */
- assert( oc_find(oir->oir_name) != NULL );
+ assert( oc_bvfind(&oir->oir_name) != NULL );
names++;
}
int
oc_add(
LDAPObjectClass *oc,
+ int user,
const char **err
)
{
ObjectClass *soc;
int code;
+ int op = 0;
if ( oc->oc_names != NULL ) {
int i;
}
}
+ 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) );
{
/* 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;
}
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( oc->soc_flags & SLAP_OC_HIDE ) continue;
+
#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;
}