X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fat.c;h=ed8fd6ef79c67a3a9debf83650f2e3750c717ed6;hb=2c94c7915a52f8df4323c8193ec424df568f0fc1;hp=9a7872db7a7241182d2e373d2dd5ef79f7e6ac84;hpb=ae7d89fa1e98eebb5e123569ac7c698bf1fc6af2;p=openldap diff --git a/servers/slapd/at.c b/servers/slapd/at.c index 9a7872db7a..ed8fd6ef79 100644 --- a/servers/slapd/at.c +++ b/servers/slapd/at.c @@ -1,6 +1,6 @@ /* $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 */ /* at.c - routines for dealing with attribute types */ @@ -18,161 +18,20 @@ #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 ) -{ - AttributeType *sat; - - sat = at_find(type); - if ( sat ) { - return( sat->sat_syntax_compat ); - } - - return( DEFAULT_SYNTAX ); -} -/* - * attr_syntax_config - process an attribute syntax config line - */ - -void -at_config( - const char *fname, - int lineno, - int argc, - char **argv -) +int is_at_syntax( + AttributeType *at, + const char *oid ) { - 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( ; at != NULL; at = at->sat_sup ) { + if( at->sat_syntax_oid ) { + return ( strcmp( at->sat_syntax_oid, oid ) == 0 ); + } } - 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; - at_config( "implicit", 0, 2, argv ); - return 0; - } + return 0; } -#endif - int is_at_subtype( AttributeType *sub, AttributeType *sup ) @@ -185,7 +44,7 @@ int is_at_subtype( } struct aindexrec { - char *air_name; + struct berval air_name; AttributeType *air_at; }; @@ -198,16 +57,23 @@ attr_index_cmp( struct aindexrec *air2 ) { - return (strcasecmp( air1->air_name, air2->air_name )); + int i = air1->air_name.bv_len - air2->air_name.bv_len; + if (i) + return i; + return (strcasecmp( air1->air_name.bv_val, air2->air_name.bv_val )); } static int attr_index_name_cmp( - char *type, + struct berval *type, struct aindexrec *air ) { - return (strcasecmp( type, air->air_name )); + int i = type->bv_len - air->air_name.bv_len; + if (i) + return i; + return (strncasecmp( type->bv_val, air->air_name.bv_val, + type->bv_len )); } AttributeType * @@ -215,36 +81,25 @@ at_find( const char *name ) { - struct aindexrec *air; - char *tmpname; + struct berval bv; -#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; - } + bv.bv_val = (char *)name; + bv.bv_len = strlen( name ); - 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 ); - } + return at_bvfind( &bv ); +} - if ( tmpname != name ) - ldap_memfree( tmpname ); - return( NULL ); +AttributeType * +at_bvfind( + struct berval *name +) +{ + struct aindexrec *air; + + air = (struct aindexrec *) avl_find( attr_index, name, + (AVL_CMP) attr_index_name_cmp ); + + return air != NULL ? air->air_at : NULL; } int @@ -260,7 +115,7 @@ at_append_to_list( list = *listp; if ( !list ) { size = 2; - list = calloc(size, sizeof(AttributeType *)); + list = ch_calloc(size, sizeof(AttributeType *)); if ( !list ) { return -1; } @@ -272,7 +127,7 @@ at_append_to_list( list1++; } size += 2; - list1 = realloc(list, size*sizeof(AttributeType *)); + list1 = ch_realloc(list, size*sizeof(AttributeType *)); if ( !list1 ) { return -1; } @@ -309,7 +164,7 @@ at_delete_from_list( } list[i] = NULL; /* Tell the runtime this can be shrinked */ - list1 = realloc(list, (i+1)*sizeof(AttributeType **)); + list1 = ch_realloc(list, (i+1)*sizeof(AttributeType **)); if ( !list1 ) { return -1; } @@ -336,6 +191,23 @@ at_find_in_list( return -1; } +void +at_destroy( void ) +{ + AttributeType *a, *n; + avl_free(attr_index, ldap_memfree); + + for (a=attr_list; a; a=n) { + n = a->sat_next; + if (a->sat_subtypes) ldap_memfree(a->sat_subtypes); + ad_destroy(a->sat_ad); + ldap_pvt_thread_mutex_destroy(&a->sat_ad_mutex); + ldap_attributetype_free((LDAPAttributeType *)a); + } + if ( slap_schema.si_at_undefined ) + ad_destroy(slap_schema.si_at_undefined->sat_ad); +} + static int at_insert( AttributeType *sat, @@ -355,7 +227,8 @@ at_insert( if ( sat->sat_oid ) { air = (struct aindexrec *) ch_calloc( 1, sizeof(struct aindexrec) ); - air->air_name = sat->sat_oid; + air->air_name.bv_val = sat->sat_oid; + air->air_name.bv_len = strlen(sat->sat_oid); air->air_at = sat; if ( avl_insert( &attr_index, (caddr_t) air, (AVL_CMP) attr_index_cmp, @@ -365,25 +238,25 @@ at_insert( return SLAP_SCHERR_DUP_ATTR; } /* FIX: temporal consistency check */ - at_find(air->air_name); + at_bvfind(&air->air_name); } if ( (names = sat->sat_names) ) { while ( *names ) { air = (struct aindexrec *) ch_calloc( 1, sizeof(struct aindexrec) ); - air->air_name = ch_strdup(*names); + air->air_name.bv_val = *names; + air->air_name.bv_len = strlen(*names); air->air_at = sat; if ( avl_insert( &attr_index, (caddr_t) air, (AVL_CMP) attr_index_cmp, (AVL_DUP) avl_dup_error ) ) { *err = *names; - ldap_memfree(air->air_name); ldap_memfree(air); return SLAP_SCHERR_DUP_ATTR; } /* FIX: temporal consistency check */ - at_find(air->air_name); + at_bvfind(&air->air_name); names++; } } @@ -393,7 +266,7 @@ at_insert( int at_add( - LDAP_ATTRIBUTE_TYPE *at, + LDAPAttributeType *at, const char **err ) { @@ -401,22 +274,81 @@ at_add( MatchingRule *mr; Syntax *syn; int code; - char *cname; + char *cname; + char *oid; + + if ( !OID_LEADCHAR( at->at_oid[0] )) { + /* Expand OID macros */ + oid = oidm_find( at->at_oid ); + if ( !oid ) { + *err = at->at_oid; + return SLAP_SCHERR_OIDM; + } + if ( oid != at->at_oid ) { + ldap_memfree( at->at_oid ); + at->at_oid = oid; + } + } + + if ( at->at_syntax_oid && !OID_LEADCHAR( at->at_syntax_oid[0] )) { + /* Expand OID macros */ + oid = oidm_find( at->at_syntax_oid ); + if ( !oid ) { + *err = at->at_syntax_oid; + return SLAP_SCHERR_OIDM; + } + if ( oid != at->at_syntax_oid ) { + ldap_memfree( at->at_syntax_oid ); + at->at_syntax_oid = oid; + } + + } if ( at->at_names && at->at_names[0] ) { + int i; + + for( i=0; at->at_names[i]; i++ ) { + if( !slap_valid_descr( at->at_names[i] ) ) { + *err = at->at_names[i]; + return SLAP_SCHERR_BAD_DESCR; + } + } + cname = at->at_names[0]; + } else if ( at->at_oid ) { cname = at->at_oid; + } else { - cname = ""; + *err = ""; return SLAP_SCHERR_ATTR_INCOMPLETE; } + + *err = cname; + + if ( !at->at_usage && at->at_no_user_mod ) { + /* user attribute must be modifable */ + return SLAP_SCHERR_ATTR_BAD_USAGE; + } + + if ( at->at_collective ) { + if( at->at_usage ) { + /* collective attributes cannot be operational */ + return SLAP_SCHERR_NOT_SUPPORTED; + } + + if( at->at_single_value ) { + /* collective attributes cannot be single-valued */ + return SLAP_SCHERR_NOT_SUPPORTED; + } + } + 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 + sat->sat_cname.bv_val = cname; + sat->sat_cname.bv_len = strlen( cname ); + ldap_pvt_thread_mutex_init(&sat->sat_ad_mutex); if ( at->at_sup_oid ) { AttributeType *supsat = at_find(at->at_sup_oid); @@ -429,9 +361,13 @@ at_add( sat->sat_sup = supsat; if ( at_append_to_list(sat, &supsat->sat_subtypes) ) { - *err = cname; return SLAP_SCHERR_OUTOFMEM; } + + if ( sat->sat_usage != supsat->sat_usage ) { + /* subtypes must have same usage as their SUP */ + return SLAP_SCHERR_ATTR_BAD_USAGE; + } } /* @@ -441,10 +377,8 @@ at_add( */ if ( sat->sat_sup ) { sat->sat_syntax = sat->sat_sup->sat_syntax; -#ifndef SLAPD_SCHEMA_NOT_COMPAT - sat->sat_syntax_compat = sat->sat_sup->sat_syntax_compat; -#endif 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; } @@ -457,38 +391,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; @@ -497,6 +399,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; @@ -532,7 +435,7 @@ at_index_printnode( struct aindexrec *air ) { printf("%s = %s\n", - air->air_name, + air->air_name.bv_val, ldap_attributetype2str(&air->air_at->sat_atype) ); return( 0 ); } @@ -550,24 +453,23 @@ at_index_print( void ) int at_schema_info( Entry *e ) { - struct berval val; - struct berval *vals[2]; + struct berval vals[2]; AttributeType *at; - vals[0] = &val; - vals[1] = NULL; + AttributeDescription *ad_attributeTypes = slap_schema.si_ad_attributeTypes; + + vals[1].bv_val = 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 ( ldap_attributetype2bv( &at->sat_atype, vals ) == NULL ) { return -1; } +#if 0 + Debug( LDAP_DEBUG_TRACE, "Merging at [%ld] %s\n", + (long) vals[0].bv_len, vals[0].bv_val, 0 ); +#endif + attr_merge( e, ad_attributeTypes, vals ); + ldap_memfree( vals[0].bv_val ); } return 0; }