X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsyntax.c;h=85025683ecc652998ec38f94043c65f92345a400;hb=3bf9998d7885ef6bbc4690d4229e5cb5068a35de;hp=28e0a18731a3af92537c5fba6c518883c1dac3d2;hpb=8502301b006e170acbc4ae9ee7aa6871f9fc79f4;p=openldap diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c index 28e0a18731..85025683ec 100644 --- a/servers/slapd/syntax.c +++ b/servers/slapd/syntax.c @@ -1,8 +1,17 @@ /* syntax.c - routines to manage syntax definitions */ /* $OpenLDAP$ */ -/* - * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file +/* This work is part of OpenLDAP Software . + * + * Copyright 1998-2008 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 + * . */ #include "portable.h" @@ -14,7 +23,6 @@ #include #include "slap.h" -#include "ldap_pvt.h" struct sindexrec { char *sir_name; @@ -22,7 +30,7 @@ struct sindexrec { }; static Avlnode *syn_index = NULL; -static LDAP_SLIST_HEAD(SyntaxList, slap_syntax) syn_list +static LDAP_SLIST_HEAD(SyntaxList, Syntax) syn_list = LDAP_SLIST_HEAD_INITIALIZER(&syn_list); static int @@ -68,16 +76,48 @@ syn_find_desc( const char *syndesc, int *len ) return( NULL ); } +int +syn_is_sup( Syntax *syn, Syntax *sup ) +{ + int i; + + assert( syn != NULL ); + assert( sup != NULL ); + + if ( syn == sup ) { + return 1; + } + + if ( syn->ssyn_sups == NULL ) { + return 0; + } + + for ( i = 0; syn->ssyn_sups[i]; i++ ) { + if ( syn->ssyn_sups[i] == sup ) { + return 1; + } + + if ( syn_is_sup( syn->ssyn_sups[i], sup ) ) { + return 1; + } + } + + return 0; +} + void syn_destroy( void ) { - Syntax *s; - - avl_free(syn_index, ldap_memfree); - while( !LDAP_SLIST_EMPTY(&syn_list) ) { - s = LDAP_SLIST_FIRST(&syn_list); - LDAP_SLIST_REMOVE_HEAD(&syn_list, ssyn_next); - ldap_syntax_free((LDAPSyntax *)s); + Syntax *s; + + avl_free( syn_index, ldap_memfree ); + while( !LDAP_SLIST_EMPTY( &syn_list ) ) { + s = LDAP_SLIST_FIRST( &syn_list ); + LDAP_SLIST_REMOVE_HEAD( &syn_list, ssyn_next ); + if ( s->ssyn_sups ) { + SLAP_FREE( s->ssyn_sups ); + } + ldap_syntax_free( (LDAPSyntax *)s ); } } @@ -89,18 +129,14 @@ syn_insert( { struct sindexrec *sir; + LDAP_SLIST_NEXT( ssyn, ssyn_next ) = NULL; LDAP_SLIST_INSERT_HEAD( &syn_list, ssyn, ssyn_next ); if ( ssyn->ssyn_oid ) { sir = (struct sindexrec *) SLAP_CALLOC( 1, sizeof(struct sindexrec) ); if( sir == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "syn_insert: SLAP_CALLOC Error\n", 0, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "SLAP_CALLOC Error\n", 0, 0, 0 ); -#endif return LDAP_OTHER; } sir->sir_name = ssyn->ssyn_oid; @@ -125,17 +161,12 @@ syn_add( ) { Syntax *ssyn; - int code; + int code = 0; ssyn = (Syntax *) SLAP_CALLOC( 1, sizeof(Syntax) ); - if( ssyn == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "syn_add: SLAP_CALLOC Error\n", 0, 0, 0 ); -#else + if ( ssyn == NULL ) { Debug( LDAP_DEBUG_ANY, "SLAP_CALLOC Error\n", 0, 0, 0 ); -#endif - return LDAP_OTHER; + return SLAP_SCHERR_OUTOFMEM; } AC_MEMCPY( &ssyn->ssyn_syn, syn, sizeof(LDAPSyntax) ); @@ -150,15 +181,50 @@ syn_add( ssyn->ssyn_oidlen = strlen(syn->syn_oid); ssyn->ssyn_flags = def->sd_flags; ssyn->ssyn_validate = def->sd_validate; - ssyn->ssyn_normalize = def->sd_normalize; ssyn->ssyn_pretty = def->sd_pretty; + ssyn->ssyn_sups = NULL; + #ifdef SLAPD_BINARY_CONVERSION ssyn->ssyn_ber2str = def->sd_ber2str; ssyn->ssyn_str2ber = def->sd_str2ber; #endif - code = syn_insert(ssyn, err); + if ( def->sd_sups != NULL ) { + int cnt; + + for ( cnt = 0; def->sd_sups[cnt] != NULL; cnt++ ) + ; + + ssyn->ssyn_sups = (Syntax **)SLAP_CALLOC( cnt + 1, + sizeof( Syntax * ) ); + if ( ssyn->ssyn_sups == NULL ) { + Debug( LDAP_DEBUG_ANY, "SLAP_CALLOC Error\n", 0, 0, 0 ); + code = SLAP_SCHERR_OUTOFMEM; + + } else { + for ( cnt = 0; def->sd_sups[cnt] != NULL; cnt++ ) { + ssyn->ssyn_sups[cnt] = syn_find( def->sd_sups[cnt] ); + if ( ssyn->ssyn_sups[cnt] == NULL ) { + *err = def->sd_sups[cnt]; + code = SLAP_SCHERR_SYN_SUP_NOT_FOUND; + } + } + } + } + + if ( code == 0 ) { + code = syn_insert( ssyn, err ); + + } + + if ( code != 0 && ssyn != NULL ) { + if ( ssyn->ssyn_sups != NULL ) { + SLAP_FREE( ssyn->ssyn_sups ); + } + SLAP_FREE( ssyn ); + } + return code; } @@ -172,47 +238,34 @@ register_syntax( syn = ldap_str2syntax( def->sd_desc, &code, &err, LDAP_SCHEMA_ALLOW_ALL); if ( !syn ) { -#ifdef NEW_LOGGING - LDAP_LOG( CONFIG, ERR, - "register_syntax: Error - %s before %s in %s.\n", - ldap_scherr2str(code), err, def->sd_desc ); -#else Debug( LDAP_DEBUG_ANY, "Error in register_syntax: %s before %s in %s\n", ldap_scherr2str(code), err, def->sd_desc ); -#endif return( -1 ); } code = syn_add( syn, def, &err ); - ldap_memfree( syn ); - if ( code ) { -#ifdef NEW_LOGGING - LDAP_LOG( CONFIG, ERR, - "register_syntax: Error - %s %s in %s\n", - scherr2str(code), err, def->sd_desc ); -#else Debug( LDAP_DEBUG_ANY, "Error in register_syntax: %s %s in %s\n", scherr2str(code), err, def->sd_desc ); -#endif + ldap_syntax_free( syn ); return( -1 ); } + ldap_memfree( syn ); + return( 0 ); } int syn_schema_info( Entry *e ) { - struct berval vals[2]; - Syntax *syn; - AttributeDescription *ad_ldapSyntaxes = slap_schema.si_ad_ldapSyntaxes; - - vals[1].bv_val = NULL; + Syntax *syn; + struct berval val; + struct berval nval; LDAP_SLIST_FOREACH(syn, &syn_list, ssyn_next ) { if ( ! syn->ssyn_validate ) { @@ -224,29 +277,22 @@ syn_schema_info( Entry *e ) continue; } - if ( ldap_syntax2bv( &syn->ssyn_syn, vals ) == NULL ) { + if ( ldap_syntax2bv( &syn->ssyn_syn, &val ) == NULL ) { return -1; } #if 0 -#ifdef NEW_LOGGING - LDAP_LOG( config, ENTRY, - "syn_schema_info: Merging syn [%ld] %s\n", - (long)vals[0].bv_len, vals[0].bv_val, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "Merging syn [%ld] %s\n", - (long) vals[0].bv_len, vals[0].bv_val, 0 ); + (long) val.bv_len, val.bv_val, 0 ); #endif -#endif -#ifdef SLAP_NVALUES - if( attr_merge( e, ad_ldapSyntaxes, vals, NULL /* FIXME */ ) ) -#else - if( attr_merge( e, ad_ldapSyntaxes, vals ) ) -#endif + nval.bv_val = syn->ssyn_oid; + nval.bv_len = strlen(syn->ssyn_oid); + + if( attr_merge_one( e, ad_ldapSyntaxes, &val, &nval ) ) { return -1; } - ldap_memfree( vals[0].bv_val ); + ldap_memfree( val.bv_val ); } return 0; }