struct aindexrec *air;
char **names;
+ LDAP_SLIST_NEXT( sat, sat_next ) = NULL;
LDAP_SLIST_INSERT_HEAD( &attr_list, sat, sat_next );
if ( sat->sat_oid ) {
}
if ( sat->sat_ordering_oid ) {
+ if( !sat->sat_equality ) {
+ *err = sat->sat_ordering_oid;
+ return SLAP_SCHERR_ATTR_BAD_MR;
+ }
+
mr = mr_find(sat->sat_ordering_oid);
if( mr == NULL ) {
}
if ( sat->sat_substr_oid ) {
+ if( !sat->sat_equality ) {
+ *err = sat->sat_substr_oid;
+ return SLAP_SCHERR_ATTR_BAD_MR;
+ }
+
mr = mr_find(sat->sat_substr_oid);
if( mr == NULL ) {
* 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_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;
int
at_schema_info( Entry *e )
{
- struct berval vals[2];
- AttributeType *at;
-
AttributeDescription *ad_attributeTypes = slap_schema.si_ad_attributeTypes;
-
- vals[1].bv_val = NULL;
+ AttributeType *at;
+ struct berval val;
+ struct berval nval;
LDAP_SLIST_FOREACH(at,&attr_list,sat_next) {
if( at->sat_flags & SLAP_AT_HIDE ) continue;
- if ( ldap_attributetype2bv( &at->sat_atype, vals ) == NULL ) {
+ if ( ldap_attributetype2bv( &at->sat_atype, &val ) == NULL ) {
return -1;
}
-#ifdef SLAP_NVALUES
- if( attr_merge( e, ad_attributeTypes, vals, NULL /* FIXME */ ) )
-#else
- if( attr_merge( e, ad_attributeTypes, vals ) )
-#endif
+ nval.bv_val = at->sat_oid;
+ nval.bv_len = strlen(at->sat_oid);
+
+ if( attr_merge_one( e, ad_attributeTypes, &val, &nval ) )
{
return -1;
}
- ldap_memfree( vals[0].bv_val );
+ ldap_memfree( val.bv_val );
}
return 0;
}