X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fat.c;h=5a618ae2969db99d2441b2866ef52de92988353b;hb=a26612bc00bacbc660fa4a26466f609a29a1d072;hp=3866108548f4cd916b9070ed5005bbb471a447cb;hpb=bc51bd5180fe6c83b92b76578e2b9e4b0492b7af;p=openldap diff --git a/servers/slapd/at.c b/servers/slapd/at.c index 3866108548..5a618ae296 100644 --- a/servers/slapd/at.c +++ b/servers/slapd/at.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 */ /* at.c - routines for dealing with attribute types */ @@ -18,163 +18,31 @@ #include "ldap_pvt.h" #include "slap.h" -#ifndef SLAPD_SCHEMA_NOT_COMPAT -char * -at_canonical_name( const char * a_type ) -{ - AttributeType *atp; - - atp=at_find(a_type); - - if ( atp == NULL ) { - return (char *) a_type; - - } else if ( atp->sat_names - && atp->sat_names[0] && (*(atp->sat_names[0]) != '\0') ) - { - return atp->sat_names[0]; - - } else if (atp->sat_oid && (*atp->sat_oid != '\0')) { - return atp->sat_oid; - } - - return (char *) a_type; -} -#define DEFAULT_SYNTAX SYNTAX_CIS - -/* - * attr_syntax - return the syntax of attribute type - */ - -int -attr_syntax( const char *type ) +int is_at_syntax( + AttributeType *at, + const char *oid ) { - AttributeType *sat; - - sat = at_find(type); - if ( sat ) { - return( sat->sat_syntax_compat ); + for( ; at != NULL; at = at->sat_sup ) { + if( at->sat_syntax_oid ) { + return ( strcmp( at->sat_syntax_oid, oid ) == 0 ); + } } - return( DEFAULT_SYNTAX ); + return 0; } -/* - * attr_syntax_config - process an attribute syntax config line - */ - -void -attr_syntax_config( - const char *fname, - int lineno, - int argc, - char **argv -) +int is_at_subtype( + AttributeType *sub, + AttributeType *sup ) { - char *save; - LDAP_ATTRIBUTE_TYPE *at; - int lasti; - int code; - const char *err; - - if ( argc < 2 ) { - Debug( LDAP_DEBUG_ANY, -"%s: line %d: missing name in \"attribute + \" (ignored)\n", - fname, lineno, 0 ); - return; - } - - at = (LDAP_ATTRIBUTE_TYPE *) - ch_calloc( 1, sizeof(LDAP_ATTRIBUTE_TYPE) ); - -#define SYNTAX_DS_OID "1.3.6.1.4.1.1466.115.121.1.15" -#define SYNTAX_DSCE_OID "2.5.13.5" -#define SYNTAX_IA5_OID "1.3.6.1.4.1.1466.115.121.1.26" -#define SYNTAX_IA5CE_OID "1.3.6.1.4.1.1466.109.114.1" -#define SYNTAX_DN_OID SLAPD_OID_DN_SYNTAX -#define SYNTAX_TEL_OID "1.3.6.1.4.1.1466.115.121.1.50" -#define SYNTAX_BIN_OID "1.3.6.1.4.1.1466.115.121.1.40" /* octetString */ - - lasti = argc - 1; - if ( strcasecmp( argv[lasti], "caseignorestring" ) == 0 || - strcasecmp( argv[lasti], "cis" ) == 0 ) { - at->at_syntax_oid = SYNTAX_DS_OID; - at->at_equality_oid = "2.5.13.2"; - at->at_ordering_oid = "2.5.13.3"; - at->at_substr_oid = "2.5.13.4"; - - } else if ( strcasecmp( argv[lasti], "telephone" ) == 0 || - strcasecmp( argv[lasti], "tel" ) == 0 ) { - at->at_syntax_oid = SYNTAX_TEL_OID; - at->at_equality_oid = "2.5.13.20"; - at->at_substr_oid = "2.5.13.21"; - - } else if ( strcasecmp( argv[lasti], "dn" ) == 0 ) { - at->at_syntax_oid = SYNTAX_DN_OID; - at->at_equality_oid = "2.5.13.1"; - - } else if ( strcasecmp( argv[lasti], "caseexactstring" ) == 0 || - strcasecmp( argv[lasti], "ces" ) == 0 ) { - at->at_syntax_oid = SYNTAX_DS_OID; - at->at_equality_oid = SYNTAX_DSCE_OID; - at->at_ordering_oid = "2.5.13.6"; - at->at_substr_oid = "2.5.13.7"; - - } else if ( strcasecmp( argv[lasti], "binary" ) == 0 || - strcasecmp( argv[lasti], "bin" ) == 0 ) { - /* bin -> octetString, not binary! */ - at->at_syntax_oid = SYNTAX_BIN_OID; - at->at_equality_oid = "2.5.13.17"; - - } 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( (AttributeType *) at ); - return; - } - - save = argv[lasti]; - argv[lasti] = NULL; - at->at_names = charray_dup( argv ); - argv[lasti] = save; - - code = at_add( at, &err ); - if ( code ) { - fprintf( stderr, "%s: line %d: %s %s\n", - fname, lineno, scherr2str(code), err); - exit( EXIT_FAILURE ); + for( ; sub != NULL; sub = sub->sat_sup ) { + if( sub == sup ) return 1; } - ldap_memfree(at); -} - -int -at_fake_if_needed( - const char *name -) -{ - char *argv[3]; - - if ( at_find( name ) ) { - return 0; - } else { - argv[0] = (char*) name; - argv[1] = "cis"; - argv[2] = NULL; - attr_syntax_config( "implicit", 0, 2, argv ); - return 0; - } + return 0; } -#endif - - - struct aindexrec { char *air_name; AttributeType *air_at; @@ -194,7 +62,7 @@ attr_index_cmp( static int attr_index_name_cmp( - char *type, + const char *type, struct aindexrec *air ) { @@ -206,36 +74,12 @@ at_find( const char *name ) { - struct aindexrec *air; - char *tmpname; - -#ifndef SLAPD_SCHEMA_NOT_COMPAT - /* - * The name may actually be an AttributeDescription, i.e. it may - * contain options. - */ - /* Treat any attribute type with option as an unknown attribute type */ - char *p = strchr( name, ';' ); - if ( p ) { - tmpname = ch_malloc( p-name+1 ); - strncpy( tmpname, name, p-name ); - tmpname[p-name] = '\0'; - } else -#endif - { - tmpname = (char *)name; - } + struct aindexrec *air; - if ( (air = (struct aindexrec *) avl_find( attr_index, tmpname, - (AVL_CMP) attr_index_name_cmp )) != NULL ) { - if ( tmpname != name ) - ldap_memfree( tmpname ); - return( air->air_at ); - } + air = (struct aindexrec *) avl_find( attr_index, name, + (AVL_CMP) attr_index_name_cmp ); - if ( tmpname != name ) - ldap_memfree( tmpname ); - return( NULL ); + return air != NULL ? air->air_at : NULL; } int @@ -384,7 +228,7 @@ at_insert( int at_add( - LDAP_ATTRIBUTE_TYPE *at, + LDAPAttributeType *at, const char **err ) { @@ -403,11 +247,9 @@ at_add( return SLAP_SCHERR_ATTR_INCOMPLETE; } sat = (AttributeType *) ch_calloc( 1, sizeof(AttributeType) ); - memcpy( &sat->sat_atype, at, sizeof(LDAP_ATTRIBUTE_TYPE)); + AC_MEMCPY( &sat->sat_atype, at, sizeof(LDAPAttributeType)); -#ifdef SLAPD_SCHEMA_NOT_COMPAT sat->sat_cname = cname; -#endif if ( at->at_sup_oid ) { AttributeType *supsat = at_find(at->at_sup_oid); @@ -432,8 +274,8 @@ at_add( */ if ( sat->sat_sup ) { sat->sat_syntax = sat->sat_sup->sat_syntax; - sat->sat_equality = sat->sat_sup->sat_equality; + sat->sat_approx = sat->sat_sup->sat_approx; sat->sat_ordering = sat->sat_sup->sat_ordering; sat->sat_substr = sat->sat_sup->sat_substr; } @@ -446,38 +288,6 @@ at_add( return SLAP_SCHERR_SYN_NOT_FOUND; } -#ifndef SLAPD_SCHEMA_NOT_COMPAT - if ( !strcmp(at->at_syntax_oid, SYNTAX_DS_OID) ) { - if ( at->at_equality_oid && ( - !strcmp(at->at_equality_oid, SYNTAX_DSCE_OID) ) ) - { - sat->sat_syntax_compat = SYNTAX_CES; - } else { - sat->sat_syntax_compat = SYNTAX_CIS; - } - - } else if ( !strcmp(at->at_syntax_oid, SYNTAX_IA5_OID) ) { - if ( at->at_equality_oid && ( - !strcmp(at->at_equality_oid, SYNTAX_IA5CE_OID) ) ) - { - sat->sat_syntax_compat = SYNTAX_CES; - } else { - sat->sat_syntax_compat = SYNTAX_CIS; - } - - } else if ( !strcmp(at->at_syntax_oid, SYNTAX_DN_OID ) ) { - sat->sat_syntax_compat = SYNTAX_CIS | SYNTAX_DN; - - } else if ( !strcmp(at->at_syntax_oid, SYNTAX_TEL_OID ) ) { - sat->sat_syntax_compat = SYNTAX_CIS | SYNTAX_TEL; - - } else if ( !strcmp(at->at_syntax_oid, SYNTAX_BIN_OID ) ) { - sat->sat_syntax_compat = SYNTAX_BIN; - - } else { - sat->sat_syntax_compat = DEFAULT_SYNTAX; - } -#endif } else if ( sat->sat_syntax == NULL ) { return SLAP_SCHERR_ATTR_INCOMPLETE; @@ -486,6 +296,7 @@ at_add( if ( sat->sat_equality_oid ) { if ( (mr = mr_find(sat->sat_equality_oid)) ) { sat->sat_equality = mr; + sat->sat_approx = mr->smr_associated; } else { *err = sat->sat_equality_oid; return SLAP_SCHERR_MR_NOT_FOUND; @@ -543,20 +354,23 @@ at_schema_info( Entry *e ) struct berval *vals[2]; AttributeType *at; + AttributeDescription *ad_attributeTypes = slap_schema.si_ad_attributeTypes; + vals[0] = &val; vals[1] = NULL; for ( at = attr_list; at; at = at->sat_next ) { val.bv_val = ldap_attributetype2str( &at->sat_atype ); - if ( val.bv_val ) { - val.bv_len = strlen( val.bv_val ); - Debug( LDAP_DEBUG_TRACE, "Merging at [%ld] %s\n", - (long) val.bv_len, val.bv_val, 0 ); - attr_merge( e, "attributeTypes", vals ); - ldap_memfree( val.bv_val ); - } else { + if ( val.bv_val == NULL ) { return -1; } + val.bv_len = strlen( val.bv_val ); +#if 0 + Debug( LDAP_DEBUG_TRACE, "Merging at [%ld] %s\n", + (long) val.bv_len, val.bv_val, 0 ); +#endif + attr_merge( e, ad_attributeTypes, vals ); + ldap_memfree( val.bv_val ); } return 0; }