X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fat.c;h=fe603c9aed9e554ff68edaed55fb35099637e161;hb=8a465da10c1a9c76cac9174c37bd854fd3e9d0ab;hp=7d2f6e1892d674e54b36d56aef4cc4a88953664a;hpb=f5e6d1db410c11b26dfe5ef2e5563f51e136c830;p=openldap
diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index 7d2f6e1892..fe603c9aed 100644
--- a/servers/slapd/at.c
+++ b/servers/slapd/at.c
@@ -1,9 +1,18 @@
+/* at.c - routines for dealing with attribute types */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
-/* at.c - routines for dealing with attribute types */
#include "portable.h"
@@ -49,14 +58,17 @@ struct aindexrec {
};
static Avlnode *attr_index = NULL;
-static AttributeType *attr_list = NULL;
+static LDAP_SLIST_HEAD(ATList, slap_attribute_type) attr_list
+ = LDAP_SLIST_HEAD_INITIALIZER(&attr_list);
static int
attr_index_cmp(
- struct aindexrec *air1,
- struct aindexrec *air2
+ const void *v_air1,
+ const void *v_air2
)
{
+ const struct aindexrec *air1 = v_air1;
+ const struct aindexrec *air2 = v_air2;
int i = air1->air_name.bv_len - air2->air_name.bv_len;
if (i)
return i;
@@ -65,10 +77,12 @@ attr_index_cmp(
static int
attr_index_name_cmp(
- struct berval *type,
- struct aindexrec *air
+ const void *v_type,
+ const void *v_air
)
{
+ const struct berval *type = v_type;
+ const struct aindexrec *air = v_air;
int i = type->bv_len - air->air_name.bv_len;
if (i)
return i;
@@ -96,8 +110,7 @@ at_bvfind(
{
struct aindexrec *air;
- air = (struct aindexrec *) avl_find( attr_index, name,
- (AVL_CMP) attr_index_name_cmp );
+ air = avl_find( attr_index, name, attr_index_name_cmp );
return air != NULL ? air->air_at : NULL;
}
@@ -194,18 +207,22 @@ at_find_in_list(
void
at_destroy( void )
{
- AttributeType *a, *n;
+ AttributeType *a;
avl_free(attr_index, ldap_memfree);
- for (a=attr_list; a; a=n) {
- n = a->sat_next;
+ while( !LDAP_SLIST_EMPTY(&attr_list) ) {
+ a = LDAP_SLIST_FIRST(&attr_list);
+ LDAP_SLIST_REMOVE_HEAD(&attr_list, sat_next);
+
if (a->sat_subtypes) ldap_memfree(a->sat_subtypes);
ad_destroy(a->sat_ad);
ldap_pvt_thread_mutex_destroy(&a->sat_ad_mutex);
ldap_attributetype_free((LDAPAttributeType *)a);
}
- if ( slap_schema.si_at_undefined )
+
+ if ( slap_schema.si_at_undefined ) {
ad_destroy(slap_schema.si_at_undefined->sat_ad);
+ }
}
int
@@ -213,7 +230,7 @@ at_start( AttributeType **at )
{
assert( at );
- *at = attr_list;
+ *at = LDAP_SLIST_FIRST(&attr_list);
return (*at != NULL);
}
@@ -225,9 +242,9 @@ at_next( AttributeType **at )
#if 1 /* pedantic check */
{
- AttributeType *tmp;
+ AttributeType *tmp = NULL;
- for ( tmp = attr_list; tmp; tmp = tmp->sat_next ) {
+ LDAP_SLIST_FOREACH(tmp,&attr_list,sat_next) {
if ( tmp == *at ) {
break;
}
@@ -237,7 +254,7 @@ at_next( AttributeType **at )
}
#endif
- *at = (*at)->sat_next;
+ *at = LDAP_SLIST_NEXT(*at,sat_next);
return (*at != NULL);
}
@@ -250,15 +267,11 @@ at_insert(
const char **err
)
{
- AttributeType **atp;
struct aindexrec *air;
char **names;
- atp = &attr_list;
- while ( *atp != NULL ) {
- atp = &(*atp)->sat_next;
- }
- *atp = sat;
+ LDAP_SLIST_NEXT( sat, sat_next ) = NULL;
+ LDAP_SLIST_INSERT_HEAD( &attr_list, sat, sat_next );
if ( sat->sat_oid ) {
air = (struct aindexrec *)
@@ -267,8 +280,7 @@ at_insert(
air->air_name.bv_len = strlen(sat->sat_oid);
air->air_at = sat;
if ( avl_insert( &attr_index, (caddr_t) air,
- (AVL_CMP) attr_index_cmp,
- (AVL_DUP) avl_dup_error ) ) {
+ attr_index_cmp, avl_dup_error ) ) {
*err = sat->sat_oid;
ldap_memfree(air);
return SLAP_SCHERR_ATTR_DUP;
@@ -285,8 +297,7 @@ at_insert(
air->air_name.bv_len = strlen(*names);
air->air_at = sat;
if ( avl_insert( &attr_index, (caddr_t) air,
- (AVL_CMP) attr_index_cmp,
- (AVL_DUP) avl_dup_error ) ) {
+ attr_index_cmp, avl_dup_error ) ) {
*err = *names;
ldap_memfree(air);
return SLAP_SCHERR_ATTR_DUP;
@@ -405,6 +416,11 @@ at_add(
return SLAP_SCHERR_ATTR_BAD_USAGE;
}
+ if ( supsat->sat_obsolete && !sat->sat_obsolete ) {
+ /* subtypes must be obsolete if super is */
+ return SLAP_SCHERR_ATTR_BAD_SUP;
+ }
+
if ( sat->sat_flags & SLAP_AT_FINAL ) {
/* cannot subtype a "final" attribute type */
return SLAP_SCHERR_ATTR_BAD_SUP;
@@ -478,6 +494,11 @@ at_add(
}
if ( sat->sat_ordering_oid ) {
+ if( !sat->sat_equality ) {
+ *err = sat->sat_ordering_oid;
+ return SLAP_SCHERR_ATTR_BAD_MR;
+ }
+
mr = mr_find(sat->sat_ordering_oid);
if( mr == NULL ) {
@@ -513,6 +534,11 @@ at_add(
}
if ( sat->sat_substr_oid ) {
+ if( !sat->sat_equality ) {
+ *err = sat->sat_substr_oid;
+ return SLAP_SCHERR_ATTR_BAD_MR;
+ }
+
mr = mr_find(sat->sat_substr_oid);
if( mr == NULL ) {
@@ -530,9 +556,7 @@ at_add(
* syntax and compat syntaxes instead of those
* associated with the substrings rule.
*/
- if( sat->sat_equality &&
- sat->sat_syntax != sat->sat_equality->smr_syntax )
- {
+ if( sat->sat_syntax != sat->sat_equality->smr_syntax ) {
if( sat->sat_equality->smr_compat_syntaxes == NULL ) {
*err = sat->sat_substr_oid;
return SLAP_SCHERR_ATTR_BAD_MR;
@@ -562,9 +586,9 @@ at_add(
#ifdef LDAP_DEBUG
static int
-at_index_printnode( struct aindexrec *air )
+at_index_printnode( void *v_air, void *ignore )
{
-
+ struct aindexrec *air = v_air;
printf("%s = %s\n",
air->air_name.bv_val,
ldap_attributetype2str(&air->air_at->sat_atype) );
@@ -575,30 +599,33 @@ static void
at_index_print( void )
{
printf("Printing attribute type index:\n");
- (void) avl_apply( attr_index, (AVL_APPLY) at_index_printnode,
- 0, -1, AVL_INORDER );
+ (void) avl_apply( attr_index, at_index_printnode, 0, -1, AVL_INORDER );
}
#endif
int
at_schema_info( Entry *e )
{
- struct berval vals[2];
- AttributeType *at;
-
AttributeDescription *ad_attributeTypes = slap_schema.si_ad_attributeTypes;
+ AttributeType *at;
+ struct berval val;
+ struct berval nval;
- vals[1].bv_val = NULL;
+ LDAP_SLIST_FOREACH(at,&attr_list,sat_next) {
+ if( at->sat_flags & SLAP_AT_HIDE ) continue;
- for ( at = attr_list; at; at = at->sat_next ) {
- if ( ldap_attributetype2bv( &at->sat_atype, vals ) == NULL ) {
+ if ( ldap_attributetype2bv( &at->sat_atype, &val ) == NULL ) {
return -1;
}
- if( at->sat_flags & SLAP_AT_HIDE ) continue;
+ nval.bv_val = at->sat_oid;
+ nval.bv_len = strlen(at->sat_oid);
- attr_merge( e, ad_attributeTypes, vals );
- ldap_memfree( vals[0].bv_val );
+ if( attr_merge_one( e, ad_attributeTypes, &val, &nval ) )
+ {
+ return -1;
+ }
+ ldap_memfree( val.bv_val );
}
return 0;
}