X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foc.c;h=cd381f1bf3443d3c69845924aa0cbfc8a32b2e17;hb=46fab059977aed107f53c96ced0f35cfff8c7836;hp=b31defeaef19610d784a8d705591721c062bae33;hpb=d611a4b49a00238ed32ae84c68f27c6a0ef2273a;p=openldap
diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index b31defeaef..cd381f1bf3 100644
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * 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
@@ -23,7 +23,6 @@
#include
#include "slap.h"
-#include "ldap_pvt.h"
int is_object_subclass(
ObjectClass *sup,
@@ -120,8 +119,9 @@ struct oindexrec {
};
static Avlnode *oc_index = NULL;
-static LDAP_SLIST_HEAD(OCList, slap_object_class) oc_list
- = LDAP_SLIST_HEAD_INITIALIZER(&oc_list);
+static Avlnode *oc_cache = NULL;
+static LDAP_STAILQ_HEAD(OCList, slap_object_class) oc_list
+ = LDAP_STAILQ_HEAD_INITIALIZER(oc_list);
static int
oc_index_cmp(
@@ -162,15 +162,64 @@ oc_bvfind( struct berval *ocname )
{
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_STAILQ_HEAD(OCUList, slap_object_class) oc_undef_list
+ = LDAP_STAILQ_HEAD_INITIALIZER(oc_undef_list);
+
+ObjectClass *
+oc_bvfind_undef( struct berval *ocname )
+{
+ ObjectClass *oc = oc_bvfind( ocname );
+
+ if ( oc ) {
+ return oc;
+ }
+
+ LDAP_STAILQ_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_STAILQ_NEXT( oc, soc_next ) = NULL;
+ LDAP_STAILQ_INSERT_HEAD( &oc_undef_list, oc, soc_next );
+
+ return oc;
+}
+
static int
oc_create_required(
ObjectClass *soc,
@@ -329,15 +378,73 @@ oc_destroy( void )
ObjectClass *o;
avl_free(oc_index, ldap_memfree);
- while( !LDAP_SLIST_EMPTY(&oc_list) ) {
- o = LDAP_SLIST_FIRST(&oc_list);
- LDAP_SLIST_REMOVE_HEAD(&oc_list, soc_next);
+ while( !LDAP_STAILQ_EMPTY(&oc_list) ) {
+ o = LDAP_STAILQ_FIRST(&oc_list);
+ LDAP_STAILQ_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);
ldap_objectclass_free((LDAPObjectClass *)o);
}
+
+ while( !LDAP_STAILQ_EMPTY(&oc_undef_list) ) {
+ o = LDAP_STAILQ_FIRST(&oc_undef_list);
+ LDAP_STAILQ_REMOVE_HEAD(&oc_undef_list, soc_next);
+
+ ch_free( (ObjectClass *)o );
+ }
+}
+
+/*
+ * check whether the two ObjectClasses actually __are__ identical,
+ * or rather inconsistent
+ */
+static int
+oc_check_dup(
+ ObjectClass *soc,
+ ObjectClass *new_soc )
+{
+ if ( new_soc->soc_oid != NULL ) {
+ if ( soc->soc_oid == NULL ) {
+ return SLAP_SCHERR_CLASS_INCONSISTENT;
+ }
+
+ if ( strcmp( soc->soc_oid, new_soc->soc_oid ) != 0 ) {
+ return SLAP_SCHERR_CLASS_INCONSISTENT;
+ }
+
+ } else {
+ if ( soc->soc_oid != NULL ) {
+ return SLAP_SCHERR_CLASS_INCONSISTENT;
+ }
+ }
+
+ if ( new_soc->soc_names ) {
+ int i;
+
+ if ( soc->soc_names == NULL ) {
+ return SLAP_SCHERR_CLASS_INCONSISTENT;
+ }
+
+ for ( i = 0; new_soc->soc_names[ i ]; i++ ) {
+ if ( soc->soc_names[ i ] == NULL ) {
+ return SLAP_SCHERR_CLASS_INCONSISTENT;
+ }
+
+ if ( strcasecmp( soc->soc_names[ i ],
+ new_soc->soc_names[ i ] ) != 0 )
+ {
+ return SLAP_SCHERR_CLASS_INCONSISTENT;
+ }
+ }
+ } else {
+ if ( soc->soc_names != NULL ) {
+ return SLAP_SCHERR_CLASS_INCONSISTENT;
+ }
+ }
+
+ return SLAP_SCHERR_CLASS_DUP;
}
static int
@@ -348,9 +455,6 @@ oc_insert(
struct oindexrec *oir;
char **names;
- LDAP_SLIST_NEXT( soc, soc_next ) = NULL;
- LDAP_SLIST_INSERT_HEAD( &oc_list, soc, soc_next );
-
if ( soc->soc_oid ) {
oir = (struct oindexrec *)
ch_calloc( 1, sizeof(struct oindexrec) );
@@ -364,13 +468,21 @@ oc_insert(
if ( avl_insert( &oc_index, (caddr_t) oir,
oc_index_cmp, avl_dup_error ) )
{
+ ObjectClass *old_soc;
+ int rc;
+
*err = soc->soc_oid;
- ldap_memfree(oir);
- return SLAP_SCHERR_CLASS_DUP;
+
+ old_soc = oc_bvfind( &oir->oir_name );
+ assert( old_soc != NULL );
+ rc = oc_check_dup( old_soc, soc );
+
+ ldap_memfree( oir );
+ return rc;
}
/* FIX: temporal consistency check */
- assert( oc_bvfind(&oir->oir_name) != NULL );
+ assert( oc_bvfind( &oir->oir_name ) != NULL );
}
if ( (names = soc->soc_names) ) {
@@ -387,9 +499,17 @@ oc_insert(
if ( avl_insert( &oc_index, (caddr_t) oir,
oc_index_cmp, avl_dup_error ) )
{
+ ObjectClass *old_soc;
+ int rc;
+
*err = *names;
- ldap_memfree(oir);
- return SLAP_SCHERR_CLASS_DUP;
+
+ old_soc = oc_bvfind( &oir->oir_name );
+ assert( old_soc != NULL );
+ rc = oc_check_dup( old_soc, soc );
+
+ ldap_memfree( oir );
+ return rc;
}
/* FIX: temporal consistency check */
@@ -398,6 +518,7 @@ oc_insert(
names++;
}
}
+ LDAP_STAILQ_INSERT_TAIL( &oc_list, soc, soc_next );
return 0;
}
@@ -406,11 +527,13 @@ int
oc_add(
LDAPObjectClass *oc,
int user,
+ ObjectClass **rsoc,
const char **err )
{
ObjectClass *soc;
int code;
int op = 0;
+ char *oidm = NULL;
if ( oc->oc_names != NULL ) {
int i;
@@ -430,7 +553,7 @@ oc_add(
return SLAP_SCHERR_OIDM;
}
if ( oid != oc->oc_oid ) {
- ldap_memfree( oc->oc_oid );
+ oidm = oc->oc_oid;
oc->oc_oid = oid;
}
}
@@ -438,6 +561,7 @@ oc_add(
soc = (ObjectClass *) ch_calloc( 1, sizeof(ObjectClass) );
AC_MEMCPY( &soc->soc_oclass, oc, sizeof(LDAPObjectClass) );
+ soc->soc_oidmacro = oidm;
if( oc->oc_names != NULL ) {
soc->soc_cname.bv_val = soc->soc_names[0];
} else {
@@ -466,10 +590,71 @@ oc_add(
if( user && op ) return SLAP_SCHERR_CLASS_BAD_USAGE;
+ if( !user ) soc->soc_flags |= SLAP_OC_HARDCODE;
+
code = oc_insert(soc,err);
+ if ( code == 0 && rsoc )
+ *rsoc = soc;
return code;
}
+void
+oc_unparse( BerVarray *res, ObjectClass *start, ObjectClass *end, int sys )
+{
+ ObjectClass *oc;
+ int i, num;
+ struct berval bv, *bva = NULL, idx;
+ char ibuf[32], *ptr;
+
+ if ( !start )
+ start = LDAP_STAILQ_FIRST( &oc_list );
+
+ /* count the result size */
+ i = 0;
+ for ( oc=start; oc; oc=LDAP_STAILQ_NEXT(oc, soc_next)) {
+ if ( sys && !(oc->soc_flags & SLAP_OC_HARDCODE)) continue;
+ i++;
+ if ( oc == end ) break;
+ }
+ if (!i) return;
+
+ num = i;
+ bva = ch_malloc( (num+1) * sizeof(struct berval) );
+ BER_BVZERO( bva );
+ idx.bv_val = ibuf;
+ if ( sys ) {
+ idx.bv_len = 0;
+ ibuf[0] = '\0';
+ }
+ i = 0;
+ for ( oc=start; oc; oc=LDAP_STAILQ_NEXT(oc, soc_next)) {
+ LDAPObjectClass loc, *locp;
+ if ( sys && !(oc->soc_flags & SLAP_OC_HARDCODE)) continue;
+ if ( oc->soc_oidmacro ) {
+ loc = oc->soc_oclass;
+ loc.oc_oid = oc->soc_oidmacro;
+ locp = &loc;
+ } else {
+ locp = &oc->soc_oclass;
+ }
+ if ( ldap_objectclass2bv( locp, &bv ) == NULL ) {
+ ber_bvarray_free( bva );
+ }
+ if ( !sys ) {
+ idx.bv_len = sprintf(idx.bv_val, "{%d}", i);
+ }
+ bva[i].bv_len = idx.bv_len + bv.bv_len;
+ bva[i].bv_val = ch_malloc( bva[i].bv_len + 1 );
+ strcpy( bva[i].bv_val, ibuf );
+ strcpy( bva[i].bv_val + idx.bv_len, bv.bv_val );
+ i++;
+ bva[i].bv_val = NULL;
+ ldap_memfree( bv.bv_val );
+ if ( oc == end ) break;
+ }
+ *res = bva;
+}
+
int
oc_schema_info( Entry *e )
{
@@ -478,7 +663,7 @@ oc_schema_info( Entry *e )
struct berval val;
struct berval nval;
- LDAP_SLIST_FOREACH( oc, &oc_list, soc_next ) {
+ LDAP_STAILQ_FOREACH( oc, &oc_list, soc_next ) {
if( oc->soc_flags & SLAP_OC_HIDE ) continue;
if ( ldap_objectclass2bv( &oc->soc_oclass, &val ) == NULL ) {