/* $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 */
#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 );
- }
-
- return( DEFAULT_SYNTAX );
-}
-
-/*
- * attr_syntax_config - process an attribute syntax config line
- */
-
-void
-at_config(
- const char *fname,
- int lineno,
- int argc,
- char **argv
-)
-{
- 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 <name>+ <syntax>\" (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 "1.3.6.1.4.1.1466.115.121.1.12"
-#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 )
}
struct aindexrec {
- char *air_name;
+ struct berval air_name;
AttributeType *air_at;
};
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(
- const 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 *
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
list = *listp;
if ( !list ) {
size = 2;
- list = calloc(size, sizeof(AttributeType *));
+ list = ch_calloc(size, sizeof(AttributeType *));
if ( !list ) {
return -1;
}
list1++;
}
size += 2;
- list1 = realloc(list, size*sizeof(AttributeType *));
+ list1 = ch_realloc(list, size*sizeof(AttributeType *));
if ( !list1 ) {
return -1;
}
}
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;
}
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);
+ }
+ ad_destroy(slap_schema.si_at_undefined->sat_ad);
+}
+
static int
at_insert(
AttributeType *sat,
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,
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++;
}
}
int
at_add(
- LDAP_ATTRIBUTE_TYPE *at,
+ LDAPAttributeType *at,
const char **err
)
{
char *cname;
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] ) ) {
+ return SLAP_SCHERR_BAD_DESCR;
+ }
+ }
+
cname = at->at_names[0];
+
} else if ( at->at_oid ) {
cname = at->at_oid;
} else {
- cname = "";
return SLAP_SCHERR_ATTR_INCOMPLETE;
}
+
+ if ( at->at_collective ) {
+ 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);
*/
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;
}
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;
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;
{
printf("%s = %s\n",
- air->air_name,
+ air->air_name.bv_val,
ldap_attributetype2str(&air->air_at->sat_atype) );
return( 0 );
}
int
at_schema_info( Entry *e )
{
- struct berval val;
- struct berval *vals[2];
+ struct berval vals[2];
AttributeType *at;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
AttributeDescription *ad_attributeTypes = slap_schema.si_ad_attributeTypes;
-#else
- char *ad_attributeTypes = "attributeTypes";
-#endif
- vals[0] = &val;
- vals[1] = NULL;
+ 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 == NULL ) {
+ if ( ldap_attributetype2bv( &at->sat_atype, vals ) == 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 );
+ (long) vals[0].bv_len, vals[0].bv_val, 0 );
#endif
attr_merge( e, ad_attributeTypes, vals );
- ldap_memfree( val.bv_val );
+ ldap_memfree( vals[0].bv_val );
}
return 0;
}