/* $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
*/
/* attr.c - routines for dealing with attributes */
#include "slap.h"
#ifdef LDAP_DEBUG
-static void at_index_print( void );
+static void at_index_print( void )
+{
+}
#endif
void
attr_free( Attribute *a )
{
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- ad_free( a->a_desc, 1 );
-#else
- free( a->a_type );
-#endif
- ber_bvecfree( a->a_vals );
+ ber_bvarray_free( a->a_vals );
free( 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*));
-
- for( i=0; a->a_vals[i] != NULL; i++ ) {
- tmp->a_vals[i] = ber_bvdup( a->a_vals[i] );
+ tmp->a_vals = ch_malloc((i+1) * sizeof(struct berval));
- 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
- tmp->a_desc = ad_dup( a->a_desc );
-#else
- tmp->a_type = ch_strdup( a->a_type );
- tmp->a_syntax = a->a_syntax;
-#endif
+ tmp->a_desc = a->a_desc;
tmp->a_next = NULL;
+ tmp->a_flags = 0;
return tmp;
}
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
/*
- * 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.
+ * attr_merge - merge the given type and value with the list of
+ * attributes in attrs.
* returns 0 everything went ok
* -1 trouble
*/
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- /* not used */
-#else
int
-attr_merge_fast(
- Entry *e,
- const char *type,
- struct berval **vals,
- int nvals,
- int naddvals,
- int *maxvals,
- Attribute ***a
-)
+attr_merge(
+ Entry *e,
+ AttributeDescription *desc,
+ BerVarray vals )
{
- if ( *a == NULL ) {
- for ( *a = &e->e_attrs; **a != NULL; *a = &(**a)->a_next ) {
- if ( strcasecmp( (**a)->a_type, type ) == 0 ) {
- break;
- }
+ Attribute **a;
+
+ for ( a = &e->e_attrs; *a != NULL; a = &(*a)->a_next ) {
+ if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) {
+ break;
}
}
- if ( **a == NULL ) {
- **a = (Attribute *) ch_malloc( sizeof(Attribute) );
- (**a)->a_vals = NULL;
- (**a)->a_type = attr_normalize( ch_strdup( type ) );
- (**a)->a_syntax = attr_syntax( type );
- (**a)->a_next = NULL;
+ if ( *a == NULL ) {
+ *a = (Attribute *) ch_malloc( sizeof(Attribute) );
+ (*a)->a_desc = desc;
+ (*a)->a_vals = NULL;
+ (*a)->a_next = NULL;
+ (*a)->a_flags = 0;
}
- return( value_add_fast( &(**a)->a_vals, vals, nvals, naddvals,
- maxvals ) );
+ return( value_add( &(*a)->a_vals, vals ) );
}
-#endif
-
-
-/*
- * attr_merge - merge the given type and value with the list of
- * attributes in attrs.
- * returns 0 everything went ok
- * -1 trouble
- */
int
-attr_merge(
- Entry *e,
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
+attr_merge_one(
+ Entry *e,
AttributeDescription *desc,
-#else
- const char *type,
-#endif
- struct berval **vals )
+ struct berval *val )
{
Attribute **a;
for ( a = &e->e_attrs; *a != NULL; a = &(*a)->a_next ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- if ( ad_cmp( (*a)->a_desc, desc ) == 0 )
-#else
- if ( strcasecmp( (*a)->a_type, type ) == 0 )
-#endif
- {
+ if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) {
break;
}
}
if ( *a == NULL ) {
*a = (Attribute *) ch_malloc( sizeof(Attribute) );
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- (*a)->a_desc = ad_dup( desc );
-#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;
+ (*a)->a_flags = 0;
}
- return( value_add( &(*a)->a_vals, vals ) );
+ return( value_add_one( &(*a)->a_vals, val ) );
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
/*
* attrs_find - find attribute(s) by AttributeDescription
* returns next attribute which is subtype of provided description.
)
{
for ( ; a != NULL; a = a->a_next ) {
- if ( is_ad_subtype( a->a_desc, desc ) == 0 ) {
+ if ( is_ad_subtype( a->a_desc, desc ) ) {
return( a );
}
}
return( NULL );
}
-#endif
/*
* attr_find - find attribute by type
Attribute *
attr_find(
Attribute *a,
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
AttributeDescription *desc
-#else
- const char *type
-#endif
)
{
for ( ; a != NULL; a = a->a_next ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- if ( ad_cmp( a->a_desc, desc ) == 0 )
-#else
- if ( strcasecmp( a->a_type, type ) == 0 )
-#endif
- {
+ if ( ad_cmp( a->a_desc, desc ) == 0 ) {
return( a );
}
}
int
attr_delete(
Attribute **attrs,
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
AttributeDescription *desc
-#else
- const char *type
-#endif
)
{
Attribute **a;
- Attribute *save;
for ( a = attrs; *a != NULL; a = &(*a)->a_next ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- if ( ad_cmp( (*a)->a_desc, desc ) == 0 )
-#else
- if ( strcasecmp( (*a)->a_type, type ) == 0 )
-#endif
- {
- break;
- }
- }
+ 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;
}
projects / openldap / blobdiff