/* $OpenLDAP$ */
/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/* at.c - routines for dealing with attribute types */
static int
attr_index_cmp(
- struct aindexrec *air1,
- struct aindexrec *air2
+ const void *v_air1,
+ const void *v_air2
)
{
+ const struct aindexrec *air1 = v_air1;
+ const struct aindexrec *air2 = v_air2;
int i = air1->air_name.bv_len - air2->air_name.bv_len;
if (i)
return i;
static int
attr_index_name_cmp(
- struct berval *type,
- struct aindexrec *air
+ const void *v_type,
+ const void *v_air
)
{
+ const struct berval *type = v_type;
+ const struct aindexrec *air = v_air;
int i = type->bv_len - air->air_name.bv_len;
if (i)
return i;
{
struct aindexrec *air;
- air = (struct aindexrec *) avl_find( attr_index, name,
- (AVL_CMP) attr_index_name_cmp );
+ air = avl_find( attr_index, name, attr_index_name_cmp );
return air != NULL ? air->air_at : NULL;
}
ad_destroy(slap_schema.si_at_undefined->sat_ad);
}
+int
+at_start( AttributeType **at )
+{
+ assert( at );
+
+ *at = attr_list;
+
+ return (*at != NULL);
+}
+
+int
+at_next( AttributeType **at )
+{
+ assert( at );
+
+#if 1 /* pedantic check */
+ {
+ AttributeType *tmp;
+
+ for ( tmp = attr_list; tmp; tmp = tmp->sat_next ) {
+ if ( tmp == *at ) {
+ break;
+ }
+ }
+
+ assert( tmp );
+ }
+#endif
+
+ *at = (*at)->sat_next;
+
+ return (*at != NULL);
+}
+
+
+
static int
at_insert(
AttributeType *sat,
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,
- (AVL_DUP) avl_dup_error ) ) {
+ attr_index_cmp, avl_dup_error ) ) {
*err = sat->sat_oid;
ldap_memfree(air);
return SLAP_SCHERR_ATTR_DUP;
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 ) ) {
+ attr_index_cmp, avl_dup_error ) ) {
*err = *names;
ldap_memfree(air);
return SLAP_SCHERR_ATTR_DUP;
AttributeType *sat;
MatchingRule *mr;
Syntax *syn;
+ int i;
int code;
char *cname;
char *oid;
ldap_memfree( at->at_syntax_oid );
at->at_syntax_oid = oid;
}
-
}
if ( at->at_names && at->at_names[0] ) {
if ( at->at_sup_oid ) {
AttributeType *supsat = at_find(at->at_sup_oid);
- if ( (supsat == NULL ) ) {
+ if ( supsat == NULL ) {
*err = at->at_sup_oid;
return SLAP_SCHERR_ATTR_NOT_FOUND;
}
return SLAP_SCHERR_ATTR_BAD_USAGE;
}
+ if ( supsat->sat_obsolete && !sat->sat_obsolete ) {
+ /* subtypes must be obsolete if super is */
+ return SLAP_SCHERR_ATTR_BAD_SUP;
+ }
+
if ( sat->sat_flags & SLAP_AT_FINAL ) {
/* cannot subtype a "final" attribute type */
return SLAP_SCHERR_ATTR_BAD_SUP;
}
if ( at->at_syntax_oid ) {
- if ( (syn = syn_find(sat->sat_syntax_oid)) ) {
- sat->sat_syntax = syn;
- } else {
+ syn = syn_find(sat->sat_syntax_oid);
+ if ( syn == NULL ) {
*err = sat->sat_syntax_oid;
return SLAP_SCHERR_SYN_NOT_FOUND;
}
+ if( sat->sat_syntax != NULL && sat->sat_syntax != syn ) {
+ return SLAP_SCHERR_ATTR_BAD_SUP;
+ }
+
+ sat->sat_syntax = syn;
} 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 {
+ mr = mr_find(sat->sat_equality_oid);
+
+ if( mr == NULL ) {
*err = sat->sat_equality_oid;
return SLAP_SCHERR_MR_NOT_FOUND;
}
+ if(( mr->smr_usage & SLAP_MR_EQUALITY ) != SLAP_MR_EQUALITY ) {
+ *err = sat->sat_equality_oid;
+ return SLAP_SCHERR_ATTR_BAD_MR;
+ }
+
+ if( sat->sat_syntax != mr->smr_syntax ) {
+ if( mr->smr_compat_syntaxes == NULL ) {
+ *err = sat->sat_equality_oid;
+ return SLAP_SCHERR_ATTR_BAD_MR;
+ }
+
+ for(i=0; mr->smr_compat_syntaxes[i]; i++) {
+ if( sat->sat_syntax == mr->smr_compat_syntaxes[i] ) {
+ i = -1;
+ break;
+ }
+ }
+
+ if( i >= 0 ) {
+ *err = sat->sat_equality_oid;
+ return SLAP_SCHERR_ATTR_BAD_MR;
+ }
+ }
+
+ sat->sat_equality = mr;
+ sat->sat_approx = mr->smr_associated;
}
if ( sat->sat_ordering_oid ) {
- if ( (mr = mr_find(sat->sat_ordering_oid)) ) {
- sat->sat_ordering = mr;
- } else {
+ mr = mr_find(sat->sat_ordering_oid);
+
+ if( mr == NULL ) {
*err = sat->sat_ordering_oid;
return SLAP_SCHERR_MR_NOT_FOUND;
}
+
+ if(( mr->smr_usage & SLAP_MR_ORDERING ) != SLAP_MR_ORDERING ) {
+ *err = sat->sat_ordering_oid;
+ return SLAP_SCHERR_ATTR_BAD_MR;
+ }
+
+ if( sat->sat_syntax != mr->smr_syntax ) {
+ if( mr->smr_compat_syntaxes == NULL ) {
+ *err = sat->sat_ordering_oid;
+ return SLAP_SCHERR_ATTR_BAD_MR;
+ }
+
+ for(i=0; mr->smr_compat_syntaxes[i]; i++) {
+ if( sat->sat_syntax == mr->smr_compat_syntaxes[i] ) {
+ i = -1;
+ break;
+ }
+ }
+
+ if( i >= 0 ) {
+ *err = sat->sat_ordering_oid;
+ return SLAP_SCHERR_ATTR_BAD_MR;
+ }
+ }
+
+ sat->sat_ordering = mr;
}
if ( sat->sat_substr_oid ) {
- if ( (mr = mr_find(sat->sat_substr_oid)) ) {
- sat->sat_substr = mr;
- } else {
+ mr = mr_find(sat->sat_substr_oid);
+
+ if( mr == NULL ) {
*err = sat->sat_substr_oid;
return SLAP_SCHERR_MR_NOT_FOUND;
}
+
+ if(( mr->smr_usage & SLAP_MR_SUBSTR ) != SLAP_MR_SUBSTR ) {
+ *err = sat->sat_substr_oid;
+ return SLAP_SCHERR_ATTR_BAD_MR;
+ }
+
+ /* due to funky LDAP builtin substring rules, we
+ * we check against the equality rule assertion
+ * syntax and compat syntaxes instead of those
+ * associated with the substrings rule.
+ */
+ if( sat->sat_equality &&
+ sat->sat_syntax != sat->sat_equality->smr_syntax )
+ {
+ if( sat->sat_equality->smr_compat_syntaxes == NULL ) {
+ *err = sat->sat_substr_oid;
+ return SLAP_SCHERR_ATTR_BAD_MR;
+ }
+
+ for(i=0; sat->sat_equality->smr_compat_syntaxes[i]; i++) {
+ if( sat->sat_syntax ==
+ sat->sat_equality->smr_compat_syntaxes[i] )
+ {
+ i = -1;
+ break;
+ }
+ }
+
+ if( i >= 0 ) {
+ *err = sat->sat_substr_oid;
+ return SLAP_SCHERR_ATTR_BAD_MR;
+ }
+ }
+
+ sat->sat_substr = mr;
}
code = at_insert(sat,err);
#ifdef LDAP_DEBUG
static int
-at_index_printnode( struct aindexrec *air )
+at_index_printnode( void *v_air, void *ignore )
{
-
+ struct aindexrec *air = v_air;
printf("%s = %s\n",
air->air_name.bv_val,
ldap_attributetype2str(&air->air_at->sat_atype) );
at_index_print( void )
{
printf("Printing attribute type index:\n");
- (void) avl_apply( attr_index, (AVL_APPLY) at_index_printnode,
- 0, -1, AVL_INORDER );
+ (void) avl_apply( attr_index, at_index_printnode, 0, -1, AVL_INORDER );
}
#endif
-#if defined( SLAPD_SCHEMA_DN )
int
at_schema_info( Entry *e )
{
vals[1].bv_val = NULL;
for ( at = attr_list; at; at = at->sat_next ) {
+ if( at->sat_flags & SLAP_AT_HIDE ) continue;
+
if ( ldap_attributetype2bv( &at->sat_atype, vals ) == NULL ) {
return -1;
}
- if( at->sat_flags & SLAP_AT_HIDE ) continue;
-
-#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 );
+ if( attr_merge( e, ad_attributeTypes, vals ) )
+ return -1;
ldap_memfree( vals[0].bv_val );
}
return 0;
}
-#endif
projects / openldap / blobdiff