X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fattr.c;h=8e3112200bf99c96797bc4776f39c2869615172d;hb=04c5711506f17cc7403240c1f335527c6bccaa33;hp=799a8a194dc77780ef31ea976223d84f11d2ab72;hpb=a97e3e94e665df092cc512cd5a3f9c5ceac820ef;p=openldap diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c index 799a8a194d..8e3112200b 100644 --- a/servers/slapd/attr.c +++ b/servers/slapd/attr.c @@ -18,9 +18,7 @@ #include #endif -#include - -#include "ldapconfig.h" +#include "ldap_defaults.h" #include "slap.h" #ifdef LDAP_DEBUG @@ -42,15 +40,9 @@ attr_free( Attribute *a ) char * attr_normalize( char *s ) { - char *save; - assert( s != NULL ); - for ( save = s; *s; s++ ) { - *s = TOLOWER( (unsigned char) *s ); - } - - return( save ); + return( str2lower( s ) ); } /* @@ -179,62 +171,6 @@ attr_delete( #define DEFAULT_SYNTAX SYNTAX_CIS -/* Force compilation errors by commenting out this -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 -) -{ - int i; - - for ( i = 0; a->asi_names[i] != NULL; i++ ) { - if ( strcasecmp( type, a->asi_names[i] ) == 0 ) { - return( 0 ); - } - } - return( 1 ); -} - -static int -attr_syntax_dup( - struct asyntaxinfo *a1, - struct asyntaxinfo *a2 -) -{ - if ( a1->asi_syntax != a2->asi_syntax ) { - return( -1 ); - } - - return( 1 ); -} - -*/ - /* * attr_syntax - return the syntax of attribute type */ @@ -268,7 +204,7 @@ attr_syntax_config( LDAP_ATTRIBUTE_TYPE *at; int lasti; int code; - char *err; + const char *err; if ( argc < 2 ) { Debug( LDAP_DEBUG_ANY, @@ -285,18 +221,22 @@ attr_syntax_config( strcasecmp( argv[lasti], "cis" ) == 0 ) { at->at_syntax_oid = "1.3.6.1.4.1.1466.115.121.1.15"; 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 = "1.3.6.1.4.1.1466.115.121.1.50"; 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 = "1.3.6.1.4.1.1466.115.121.1.12"; at->at_equality_oid = "2.5.13.1"; } else if ( strcasecmp( argv[lasti], "caseexactstring" ) == 0 || strcasecmp( argv[lasti], "ces" ) == 0 ) { at->at_syntax_oid = "1.3.6.1.4.1.1466.115.121.1.15"; - /* notice: this is caseExactIA5Match */ - at->at_equality_oid = "1.3.6.1.4.1.1466.109.114.1"; + at->at_equality_oid = "2.5.13.5"; + 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 ) { at->at_syntax_oid = "1.3.6.1.4.1.1466.115.121.1.5"; @@ -372,7 +312,7 @@ attr_index_name_cmp( AttributeType * at_find( - char *name + const char *name ) { struct aindexrec *air = NULL; @@ -476,7 +416,7 @@ at_find_in_list( static int at_insert( AttributeType *sat, - char **err + const char **err ) { AttributeType **atp; @@ -529,18 +469,23 @@ at_insert( int at_add( LDAP_ATTRIBUTE_TYPE *at, - char **err + const char **err ) { AttributeType *sat; AttributeType *sat1; + MatchingRule *mr; + Syntax *syn; int code; char *errattr; if ( at->at_names && at->at_names[0] ) { errattr = at->at_names[0]; - } else { + } else if ( at->at_oid ) { errattr = at->at_oid; + } else { + errattr = ""; + return SLAP_SCHERR_ATTR_INCOMPLETE; } sat = (AttributeType *) ch_calloc( 1, sizeof(AttributeType) ); memcpy( &sat->sat_atype, at, sizeof(LDAP_ATTRIBUTE_TYPE)); @@ -552,33 +497,119 @@ at_add( return SLAP_SCHERR_OUTOFMEM; } } else { - *err = errattr; + *err = at->at_sup_oid; return SLAP_SCHERR_ATTR_NOT_FOUND; } } - if ( !strcmp(at->at_syntax_oid, "1.3.6.1.4.1.1466.115.121.1.15") ) { - if ( !strcmp(at->at_equality_oid, - "1.3.6.1.4.1.1466.109.114.1") ) { - sat->sat_syntax_compat = SYNTAX_CES; + if ( at->at_syntax_oid ) { + if ( (syn = syn_find(sat->sat_syntax_oid)) ) { + sat->sat_syntax = syn; + } else { + *err = sat->sat_syntax_oid; + return SLAP_SCHERR_SYN_NOT_FOUND; + } + if ( !strcmp(at->at_syntax_oid, + "1.3.6.1.4.1.1466.115.121.1.15") ) { + if ( at->at_equality_oid && + !strcmp(at->at_equality_oid, "2.5.13.5") ) { + sat->sat_syntax_compat = SYNTAX_CES; + } else { + sat->sat_syntax_compat = SYNTAX_CIS; + } + } else if ( !strcmp(at->at_syntax_oid, + "1.3.6.1.4.1.1466.115.121.1.50") ) { + sat->sat_syntax_compat = SYNTAX_CIS | SYNTAX_TEL; + } else if ( !strcmp(at->at_syntax_oid, + "1.3.6.1.4.1.1466.115.121.1.12") ) { + sat->sat_syntax_compat = SYNTAX_CIS | SYNTAX_DN; + } else if ( !strcmp(at->at_syntax_oid, "1.3.6.1.4.1.1466.115.121.1.5") ) { + sat->sat_syntax_compat = SYNTAX_BIN; } else { - sat->sat_syntax_compat = SYNTAX_CIS; + sat->sat_syntax_compat = DEFAULT_SYNTAX; } - } else if ( !strcmp(at->at_syntax_oid, - "1.3.6.1.4.1.1466.115.121.1.50") ) { - sat->sat_syntax_compat = SYNTAX_CIS | SYNTAX_TEL; - } else if ( !strcmp(at->at_syntax_oid, "1.3.6.1.4.1.1466.115.121.1.12") ) { - sat->sat_syntax_compat = SYNTAX_CIS | SYNTAX_DN; - } else if ( !strcmp(at->at_syntax_oid, "1.3.6.1.4.1.1466.115.121.1.5") ) { - sat->sat_syntax_compat = SYNTAX_BIN; } else { sat->sat_syntax_compat = DEFAULT_SYNTAX; } + if ( sat->sat_equality_oid ) { + if ( (mr = mr_find(sat->sat_equality_oid)) ) { + sat->sat_equality = mr; + } else { + *err = sat->sat_equality_oid; + return SLAP_SCHERR_MR_NOT_FOUND; + } + } + if ( sat->sat_ordering_oid ) { + if ( (mr = mr_find(sat->sat_ordering_oid)) ) { + sat->sat_ordering = mr; + } else { + *err = sat->sat_ordering_oid; + return SLAP_SCHERR_MR_NOT_FOUND; + } + } + if ( sat->sat_substr_oid ) { + if ( (mr = mr_find(sat->sat_substr_oid)) ) { + sat->sat_substr = mr; + } else { + *err = sat->sat_substr_oid; + return SLAP_SCHERR_MR_NOT_FOUND; + } + } + + /* + * Now inherit definitions from superiors. We only check the + * direct superior since that one has already inherited from + * its own superiorss + */ + if ( sat->sat_sup ) { + if ( !sat->sat_syntax ) { + sat->sat_syntax = sat->sat_sup->sat_syntax; + sat->sat_syntax_len = sat->sat_sup->sat_syntax_len; + } + if ( !sat->sat_equality ) { + sat->sat_equality = sat->sat_sup->sat_equality; + } + if ( !sat->sat_ordering ) { + sat->sat_ordering = sat->sat_sup->sat_ordering; + } + if ( !sat->sat_substr ) { + sat->sat_substr = sat->sat_sup->sat_substr; + } + } code = at_insert(sat,err); return code; } + +char * +at_canonical_name( char * a_type ) +{ + AttributeType *atp; + + if ( (atp=at_find(a_type)) == NULL ) { + + return 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; + + } else { + + return a_type; + + } + +}/* char * at_canonica_name() */ + + #if defined( SLAPD_SCHEMA_DN ) int