X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fattr.c;h=dff429ded9a358e068cdca3db1ba3814cb09020b;hb=a5ee438c9394a19a241716d3d922299c20b0365d;hp=51752ee9ac4008b37ca6ac5de3907c7e19c94d15;hpb=b5494457d86d7b57b8de5fccda725e143c8e30bd;p=openldap diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c index 51752ee9ac..dff429ded9 100644 --- a/servers/slapd/attr.c +++ b/servers/slapd/attr.c @@ -1,3 +1,8 @@ +/* $OpenLDAP$ */ +/* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ /* attr.c - routines for dealing with attributes */ #include "portable.h" @@ -14,22 +19,95 @@ #include #include -#ifdef HAVE_SYS_PARAM_H -#include -#endif - -#include - +#include "ldap_pvt.h" #include "slap.h" +#ifdef LDAP_DEBUG +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 ); free( a ); } +void +attrs_free( Attribute *a ) +{ + Attribute *next; + + for( ; a != NULL ; a = next ) { + next = a->a_next; + attr_free( a ); + } +} + +Attribute *attr_dup( Attribute *a ) +{ + Attribute *tmp; + + if( a == NULL) return NULL; + + tmp = ch_malloc( sizeof(Attribute) ); + + if( a->a_vals != NULL ) { + int i; + + for( i=0; a->a_vals[i] != 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] ); + + if( tmp->a_vals[i] == NULL ) break; + } + + tmp->a_vals[i] = 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_next = NULL; + + return tmp; +} + +Attribute *attrs_dup( Attribute *a ) +{ + Attribute *tmp, **next; + + if( a == NULL ) return NULL; + + tmp = NULL; + next = &tmp; + + for( ; a != NULL ; a = a->a_next ) { + *next = attr_dup( a ); + next = &((*next)->a_next); + } + *next = NULL; + + return tmp; +} + +#ifndef SLAPD_SCHEMA_NOT_COMPAT /* * attr_normalize - normalize an attribute name (make it all lowercase) */ @@ -37,14 +115,11 @@ attr_free( Attribute *a ) char * attr_normalize( char *s ) { - char *save; + assert( s != NULL ); - for ( save = s; *s; s++ ) { - *s = TOLOWER( *s ); - } - - return( save ); + return( ldap_pvt_str2lower( s ) ); } +#endif /* * attr_merge_fast - merge the given type and value with the list of @@ -54,10 +129,13 @@ attr_normalize( char *s ) * -1 trouble */ +#ifdef SLAPD_SCHEMA_NOT_COMPAT + /* not used */ +#else int attr_merge_fast( Entry *e, - char *type, + const char *type, struct berval **vals, int nvals, int naddvals, @@ -65,8 +143,6 @@ attr_merge_fast( Attribute ***a ) { - int i; - if ( *a == NULL ) { for ( *a = &e->e_attrs; **a != NULL; *a = &(**a)->a_next ) { if ( strcasecmp( (**a)->a_type, type ) == 0 ) { @@ -77,8 +153,8 @@ attr_merge_fast( if ( **a == NULL ) { **a = (Attribute *) ch_malloc( sizeof(Attribute) ); - (**a)->a_type = attr_normalize( strdup( type ) ); (**a)->a_vals = NULL; + (**a)->a_type = attr_normalize( ch_strdup( type ) ); (**a)->a_syntax = attr_syntax( type ); (**a)->a_next = NULL; } @@ -86,6 +162,8 @@ attr_merge_fast( return( value_add_fast( &(**a)->a_vals, vals, nvals, naddvals, maxvals ) ); } +#endif + /* * attr_merge - merge the given type and value with the list of @@ -97,249 +175,125 @@ attr_merge_fast( int attr_merge( Entry *e, - char *type, - struct berval **vals -) +#ifdef SLAPD_SCHEMA_NOT_COMPAT + AttributeDescription *desc, +#else + const char *type, +#endif + struct berval **vals ) { - int i; Attribute **a; for ( a = &e->e_attrs; *a != NULL; a = &(*a)->a_next ) { - if ( strcasecmp( (*a)->a_type, type ) == 0 ) { +#ifdef SLAPD_SCHEMA_NOT_COMPAT + if ( ad_cmp( (*a)->a_desc, desc ) == 0 ) +#else + if ( strcasecmp( (*a)->a_type, type ) == 0 ) +#endif + { break; } } if ( *a == NULL ) { *a = (Attribute *) ch_malloc( sizeof(Attribute) ); - (*a)->a_type = attr_normalize( strdup( type ) ); - (*a)->a_vals = NULL; +#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_vals = NULL; (*a)->a_next = NULL; } return( value_add( &(*a)->a_vals, vals ) ); } +#ifdef SLAPD_SCHEMA_NOT_COMPAT /* - * attr_find - find and return attribute type in list a + * attrs_find - find attribute(s) by AttributeDescription + * returns next attribute which is subtype of provided description. */ Attribute * -attr_find( +attrs_find( Attribute *a, - char *type + AttributeDescription *desc ) { for ( ; a != NULL; a = a->a_next ) { - if ( strcasecmp( a->a_type, type ) == 0 ) { + if ( is_ad_subtype( a->a_desc, desc ) ) { return( a ); } } return( NULL ); } +#endif /* - * attr_delete - delete the attribute type in list pointed to by attrs - * return 0 deleted ok - * 1 not found in list a - * -1 something bad happened + * attr_find - find attribute by type */ -int -attr_delete( - Attribute **attrs, - char *type -) -{ - Attribute **a; - Attribute *save; - - for ( a = attrs; *a != NULL; a = &(*a)->a_next ) { - if ( strcasecmp( (*a)->a_type, type ) == 0 ) { - break; - } - } - - if ( *a == NULL ) { - return( 1 ); - } - - save = *a; - *a = (*a)->a_next; - attr_free( save ); - - return( 0 ); -} - -#define DEFAULT_SYNTAX SYNTAX_CIS - -struct asyntaxinfo { - char **asi_names; - int asi_syntax; -}; - -static Avlnode *attr_syntaxes = NULL; - -static int -attr_syntax_cmp( - struct asyntaxinfo *a1, - struct asyntaxinfo *a2 -) -{ - return( strcasecmp( a1->asi_names[0], a2->asi_names[0] ) ); -} - -static int -attr_syntax_name_cmp( - char *type, - struct asyntaxinfo *a -) -{ - return( strcasecmp( type, a->asi_names[0] ) ); -} - -static int -attr_syntax_names_cmp( - char *type, - struct asyntaxinfo *a +Attribute * +attr_find( + Attribute *a, +#ifdef SLAPD_SCHEMA_NOT_COMPAT + AttributeDescription *desc +#else + const char *type +#endif ) { - int i; - - for ( i = 0; a->asi_names[i] != NULL; i++ ) { - if ( strcasecmp( type, a->asi_names[i] ) == 0 ) { - return( 0 ); + 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 + { + return( a ); } } - return( 1 ); -} - -static int -attr_syntax_dup( - struct asyntaxinfo *a1, - struct asyntaxinfo *a2 -) -{ - if ( a1->asi_syntax != a2->asi_syntax ) { - return( -1 ); - } - return( 1 ); + return( NULL ); } /* - * attr_syntax - return the syntax of attribute type + * attr_delete - delete the attribute type in list pointed to by attrs + * return 0 deleted ok + * 1 not found in list a + * -1 something bad happened */ int -attr_syntax( char *type ) -{ - struct asyntaxinfo *asi = NULL; - - if ( (asi = (struct asyntaxinfo *) avl_find( attr_syntaxes, type, - attr_syntax_name_cmp )) != NULL || (asi = (struct asyntaxinfo *) - avl_find_lin( attr_syntaxes, type, attr_syntax_names_cmp )) - != NULL ) - { - return( asi->asi_syntax ); - } - - return( DEFAULT_SYNTAX ); -} - -/* - * attr_syntax_config - process an attribute syntax config line - */ - -void -attr_syntax_config( - char *fname, - int lineno, - int argc, - char **argv +attr_delete( + Attribute **attrs, +#ifdef SLAPD_SCHEMA_NOT_COMPAT + AttributeDescription *desc +#else + const char *type +#endif ) { - char *save; - struct asyntaxinfo *a; - int i, lasti; - - if ( argc < 2 ) { - Debug( LDAP_DEBUG_ANY, -"%s: line %d: missing name in \"attribute + \" (ignored)\n", - fname, lineno, 0 ); - return; - } - - a = (struct asyntaxinfo *) ch_calloc( 1, sizeof(struct asyntaxinfo) ); - - lasti = argc - 1; - if ( strcasecmp( argv[lasti], "caseignorestring" ) == 0 || - strcasecmp( argv[lasti], "cis" ) == 0 ) { - a->asi_syntax = SYNTAX_CIS; - } else if ( strcasecmp( argv[lasti], "telephone" ) == 0 || - strcasecmp( argv[lasti], "tel" ) == 0 ) { - a->asi_syntax = (SYNTAX_CIS | SYNTAX_TEL); - } else if ( strcasecmp( argv[lasti], "dn" ) == 0 ) { - a->asi_syntax = (SYNTAX_CIS | SYNTAX_DN); - } else if ( strcasecmp( argv[lasti], "caseexactstring" ) == 0 || - strcasecmp( argv[lasti], "ces" ) == 0 ) { - a->asi_syntax = SYNTAX_CES; - } else if ( strcasecmp( argv[lasti], "binary" ) == 0 || - strcasecmp( argv[lasti], "bin" ) == 0 ) { - a->asi_syntax = SYNTAX_BIN; - } else { - Debug( LDAP_DEBUG_ANY, - "%s: line %d: unknown syntax \"%s\" in attribute line (ignored)\n", - fname, lineno, argv[lasti] ); - Debug( LDAP_DEBUG_ANY, - "possible syntaxes are \"cis\", \"ces\", \"tel\", \"dn\", or \"bin\"\n", - 0, 0, 0 ); - free( (char *) a ); - return; - } - save = argv[lasti]; - argv[lasti] = NULL; - a->asi_names = charray_dup( argv ); - argv[lasti] = save; - - switch ( avl_insert( &attr_syntaxes, (caddr_t) a, attr_syntax_cmp, - attr_syntax_dup ) ) { - case -1: /* duplicate - different syntaxes */ - Debug( LDAP_DEBUG_ARGS, "%s: line %d: duplicate attribute\n", - fname, lineno, 0 ); - /* FALL */ - - case 1: /* duplicate - same syntaxes */ - charray_free( a->asi_names ); - free( (char *) a ); - break; - - default: /* inserted */ - break; - } -} - -#ifdef LDAP_DEBUG + Attribute **a; -static int -attr_syntax_printnode( struct asyntaxinfo *a ) -{ - int i; + 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 + { + Attribute *save = *a; + *a = (*a)->a_next; + attr_free( save ); - printf( "syntax: 0x%x\n", a->asi_syntax ); - for ( i = 0; a->asi_names[i] != NULL; i++ ) { - printf( " name: %s\n", a->asi_names[i] ); + return LDAP_SUCCESS; + } } - return( 0 ); -} -static void -attr_syntax_print( void ) -{ - (void) avl_apply( attr_syntaxes, attr_syntax_printnode, 0, -1, - AVL_INORDER ); + return LDAP_NO_SUCH_ATTRIBUTE; } -#endif