X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fattr.c;h=19358e8948af6f6816e4845712f34b9158e651e9;hb=4aa2a2869219880c9a76d9c0ae163a7ff7a51d4e;hp=0621645f032cce948f3cd739678d8b8dcd245958;hpb=f9195f9b6f9fc995fe120a9ff0fcd01d51fd0cc8;p=openldap diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c index 0621645f03..19358e8948 100644 --- a/servers/slapd/attr.c +++ b/servers/slapd/attr.c @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* attr.c - routines for dealing with attributes */ @@ -23,32 +23,13 @@ #include "slap.h" #ifdef LDAP_DEBUG -static void at_index_print( void ); -#endif - -#ifdef SLAPD_SCHEMA_NOT_COMPAT -void -ad_free( AttributeDescription *ad, int freeit ) -{ - if( ad == NULL ) return; - - ber_bvfree( ad->ad_cname ); - free( ad->ad_lang ); - - if( freeit ) free( ad ); -} +static void at_index_print( void ) {}; #endif void attr_free( Attribute *a ) { -#ifdef SLAPD_SCHEMA_NOT_COMPAT - /* not yet implemented */ - ad_free( &a->a_desc, 0 ); -#else - free( a->a_type ); -#endif - ber_bvecfree( a->a_vals ); + bvarray_free( a->a_vals ); free( a ); } @@ -74,33 +55,24 @@ Attribute *attr_dup( Attribute *a ) if( a->a_vals != NULL ) { int i; - for( i=0; a->a_vals[i] != NULL; i++ ) { + for( i=0; a->a_vals[i].bv_val != NULL; i++ ) { /* EMPTY */ ; } - tmp->a_vals = ch_malloc((i+1) * sizeof(struct berval*)); + tmp->a_vals = ch_malloc((i+1) * sizeof(struct berval)); - for( i=0; a->a_vals[i] != NULL; i++ ) { - tmp->a_vals[i] = ber_bvdup( a->a_vals[i] ); - - if( tmp->a_vals[i] == NULL ) break; + for( i=0; a->a_vals[i].bv_val != NULL; i++ ) { + ber_dupbv( &tmp->a_vals[i], &a->a_vals[i] ); + if( tmp->a_vals[i].bv_val == NULL ) break; } - tmp->a_vals[i] = NULL; + tmp->a_vals[i].bv_val = NULL; } else { tmp->a_vals = NULL; } -#ifdef SLAPD_SCHEMA_NOT_COMPAT - /* not yet implemented */ tmp->a_desc = a->a_desc; - tmp->a_desc.ad_cname = ber_bvdup( a->a_desc.ad_cname ); - tmp->a_desc.ad_lang = ch_strdup( a->a_desc.ad_lang ); -#else - tmp->a_type = ch_strdup( a->a_type ); - tmp->a_syntax = a->a_syntax; -#endif tmp->a_next = NULL; return tmp; @@ -124,66 +96,7 @@ Attribute *attrs_dup( Attribute *a ) return tmp; } -#ifndef SLAPD_SCHEMA_NOT_COMPAT -/* - * attr_normalize - normalize an attribute name (make it all lowercase) - */ - -char * -attr_normalize( char *s ) -{ - assert( s != NULL ); - return( ldap_pvt_str2lower( s ) ); -} -#endif - -#ifndef SLAPD_SCHEMA_NOT_COMPAT -/* - * attr_merge_fast - merge the given type and value with the list of - * attributes in attrs. called from str2entry(), where we can make some - * assumptions to make things faster. - * returns 0 everything went ok - * -1 trouble - */ - -int -attr_merge_fast( - Entry *e, - const char *type, - struct berval **vals, - int nvals, - int naddvals, - int *maxvals, - Attribute ***a -) -{ - if ( *a == NULL ) { - for ( *a = &e->e_attrs; **a != NULL; *a = &(**a)->a_next ) { -#ifdef SLAPD_SCHEMA_NOT_COMPAT - /* not yet implemented */ -#else - if ( strcasecmp( (**a)->a_type, type ) == 0 ) { - break; - } -#endif - } - } - - if ( **a == NULL ) { - **a = (Attribute *) ch_malloc( sizeof(Attribute) ); - (**a)->a_vals = NULL; -#ifndef SLAPD_SCHEMA_NOT_COMPAT - (**a)->a_type = attr_normalize( ch_strdup( type ) ); - (**a)->a_syntax = attr_syntax( type ); -#endif - (**a)->a_next = NULL; - } - - return( value_add_fast( &(**a)->a_vals, vals, nvals, naddvals, - maxvals ) ); -} -#endif /* * attr_merge - merge the given type and value with the list of @@ -194,31 +107,22 @@ attr_merge_fast( int attr_merge( - Entry *e, - const char *type, - struct berval **vals -) + Entry *e, + AttributeDescription *desc, + BVarray vals ) { Attribute **a; for ( a = &e->e_attrs; *a != NULL; a = &(*a)->a_next ) { -#ifdef SLAPD_SCHEMA_NOT_COMPAT - /* not yet implemented */ -#else - if ( strcasecmp( (*a)->a_type, type ) == 0 ) { + if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) + { break; } -#endif } if ( *a == NULL ) { *a = (Attribute *) ch_malloc( sizeof(Attribute) ); -#ifdef SLAPD_SCHEMA_NOT_COMPAT - /* not yet implemented */ -#else - (*a)->a_type = attr_normalize( ch_strdup( type ) ); - (*a)->a_syntax = attr_syntax( type ); -#endif + (*a)->a_desc = desc; (*a)->a_vals = NULL; (*a)->a_next = NULL; } @@ -226,6 +130,26 @@ attr_merge( return( value_add( &(*a)->a_vals, vals ) ); } +/* + * attrs_find - find attribute(s) by AttributeDescription + * returns next attribute which is subtype of provided description. + */ + +Attribute * +attrs_find( + Attribute *a, + AttributeDescription *desc +) +{ + for ( ; a != NULL; a = a->a_next ) { + if ( is_ad_subtype( a->a_desc, desc ) ) { + return( a ); + } + } + + return( NULL ); +} + /* * attr_find - find attribute by type */ @@ -233,17 +157,14 @@ attr_merge( Attribute * attr_find( Attribute *a, - const char *type + AttributeDescription *desc ) { for ( ; a != NULL; a = a->a_next ) { -#ifdef SLAPD_SCHEMA_NOT_COMPAT - /* not yet implemented */ -#else - if ( strcasecmp( a->a_type, type ) == 0 ) { + if ( ad_cmp( a->a_desc, desc ) == 0 ) + { return( a ); } -#endif } return( NULL ); @@ -259,30 +180,22 @@ attr_find( int attr_delete( Attribute **attrs, - const char *type + AttributeDescription *desc ) { Attribute **a; - Attribute *save; for ( a = attrs; *a != NULL; a = &(*a)->a_next ) { -#ifdef SLAPD_SCHEMA_NOT_COMPAT - /* not yet implemented */ -#else - if ( strcasecmp( (*a)->a_type, type ) == 0 ) { - break; - } -#endif - } + if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) + { + Attribute *save = *a; + *a = (*a)->a_next; + attr_free( save ); - if ( *a == NULL ) { - return( 1 ); + return LDAP_SUCCESS; + } } - save = *a; - *a = (*a)->a_next; - attr_free( save ); - - return( 0 ); + return LDAP_NO_SUCH_ATTRIBUTE; }