/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include <ac/socket.h>
#include "slap.h"
-#include "ldap_pvt.h"
int is_object_subclass(
ObjectClass *sup,
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
+#if 0
Debug( LDAP_DEBUG_TRACE, "is_object_subclass(%s,%s) %d\n",
sup->soc_oid, sub->soc_oid, sup == sub );
-#endif
#endif
if( sup == sub ) {
attr = attr_find(e->e_attrs, objectClass);
if( attr == NULL ) {
/* no objectClass attribute */
-#ifdef NEW_LOGGING
- 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",
e->e_dn == NULL ? "" : e->e_dn,
oc->soc_oclass.oc_oid, 0 );
-#endif
return 0;
}
};
static Avlnode *oc_index = NULL;
+static Avlnode *oc_cache = NULL;
static LDAP_SLIST_HEAD(OCList, slap_object_class) oc_list
= LDAP_SLIST_HEAD_INITIALIZER(&oc_list);
{
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 );
}
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 );
}
{
struct oindexrec *oir;
+ if ( oc_cache ) {
+ oir = avl_find( oc_cache, ocname, oc_index_name_cmp );
+ if ( oir ) return oir->oir_oc;
+ }
oir = avl_find( oc_index, ocname, oc_index_name_cmp );
if ( oir != NULL ) {
+ if ( at_oc_cache ) {
+ avl_insert( &oc_cache, (caddr_t) oir,
+ oc_index_cmp, avl_dup_error );
+ }
return( oir->oir_oc );
}
return( NULL );
}
+static LDAP_SLIST_HEAD(OCUList, slap_object_class) oc_undef_list
+ = LDAP_SLIST_HEAD_INITIALIZER(&oc_undef_list);
+
+ObjectClass *
+oc_bvfind_undef( struct berval *ocname )
+{
+ ObjectClass *oc = oc_bvfind( ocname );
+
+ if ( oc ) {
+ return oc;
+ }
+
+ LDAP_SLIST_FOREACH( oc, &oc_undef_list, soc_next ) {
+ int d = oc->soc_cname.bv_len - ocname->bv_len;
+
+ if ( d ) {
+ continue;
+ }
+
+ if ( strcasecmp( oc->soc_cname.bv_val, ocname->bv_val ) == 0 ) {
+ break;
+ }
+ }
+
+ if ( oc ) {
+ return oc;
+ }
+
+ oc = ch_malloc( sizeof( ObjectClass ) + ocname->bv_len + 1 );
+ memset( oc, 0, sizeof( ObjectClass ) );
+
+ oc->soc_cname.bv_len = ocname->bv_len;
+ oc->soc_cname.bv_val = (char *)&oc[ 1 ];
+ AC_MEMCPY( oc->soc_cname.bv_val, ocname->bv_val, ocname->bv_len );
+
+ LDAP_SLIST_NEXT( oc, soc_next ) = NULL;
+ LDAP_SLIST_INSERT_HEAD( &oc_undef_list, oc, soc_next );
+
+ return oc;
+}
+
static int
oc_create_required(
ObjectClass *soc,
if (o->soc_allowed) ldap_memfree(o->soc_allowed);
ldap_objectclass_free((LDAPObjectClass *)o);
}
+
+ while( !LDAP_SLIST_EMPTY(&oc_undef_list) ) {
+ o = LDAP_SLIST_FIRST(&oc_undef_list);
+ LDAP_SLIST_REMOVE_HEAD(&oc_undef_list, soc_next);
+
+ ch_free( (ObjectClass *)o );
+ }
}
static int
oc_insert(
ObjectClass *soc,
- const char **err
-)
+ const char **err )
{
struct oindexrec *oir;
char **names;
assert( oir->oir_oc );
if ( avl_insert( &oc_index, (caddr_t) oir,
- oc_index_cmp, avl_dup_error ) )
+ oc_index_cmp, avl_dup_error ) )
{
*err = soc->soc_oid;
ldap_memfree(oir);
assert( oir->oir_oc );
if ( avl_insert( &oc_index, (caddr_t) oir,
- oc_index_cmp, avl_dup_error ) )
+ oc_index_cmp, avl_dup_error ) )
{
*err = *names;
ldap_memfree(oir);
oc_add(
LDAPObjectClass *oc,
int user,
- const char **err
-)
+ const char **err )
{
ObjectClass *soc;
int code;
}
if ( code != 0 ) return code;
+ if( user && op ) return SLAP_SCHERR_CLASS_BAD_SUP;
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, &op, err );
if ( code != 0 ) return code;
- if( user && op ) return SLAP_SCHERR_CLASS_BAD_SUP;
+ if( user && op ) return SLAP_SCHERR_CLASS_BAD_USAGE;
code = oc_insert(soc,err);
return code;
return -1;
}
- nval.bv_val = oc->soc_oid;
- nval.bv_len = strlen(oc->soc_oid);
+ nval = oc->soc_cname;
#if 0
Debug( LDAP_DEBUG_TRACE, "Merging oc [%ld] %s (%s)\n",
(long) val.bv_len, val.bv_val, nval.bv_val );
#endif
- if( attr_merge_one( e, ad_objectClasses, &val, &nval ) )
- {
+ if( attr_merge_one( e, ad_objectClasses, &val, &nval ) ) {
return -1;
}
ldap_memfree( val.bv_val );