return( ldap_pvt_str2lower( s ) );
}
-#endif
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
/*
* attr_merge_fast - merge the given type and value with the list of
* attributes in attrs. called from str2entry(), where we can make some
{
if ( *a == NULL ) {
for ( *a = &e->e_attrs; **a != NULL; *a = &(**a)->a_next ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- /* not yet implemented */
-#else
if ( strcasecmp( (**a)->a_type, type ) == 0 ) {
break;
}
-#endif
}
}
if ( **a == NULL ) {
**a = (Attribute *) ch_malloc( sizeof(Attribute) );
(**a)->a_vals = NULL;
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
(**a)->a_type = attr_normalize( ch_strdup( type ) );
(**a)->a_syntax = attr_syntax( type );
-#endif
(**a)->a_next = NULL;
}
}
#endif
+
/*
* attr_merge - merge the given type and value with the list of
* attributes in attrs.
)
{
for ( ; a != NULL; a = a->a_next ) {
- if ( is_ad_subtype( a->a_desc, desc ) == 0 ) {
+ if ( is_ad_subtype( a->a_desc, desc ) ) {
return( a );
}
}
)
{
Attribute **a;
- Attribute *save;
for ( a = attrs; *a != NULL; a = &(*a)->a_next ) {
#ifdef SLAPD_SCHEMA_NOT_COMPAT
if ( strcasecmp( (*a)->a_type, type ) == 0 )
#endif
{
- break;
- }
- }
+ Attribute *save = *a;
+ *a = (*a)->a_next;
+ attr_free( save );
- if ( *a == NULL ) {
- return( 1 );
+ return LDAP_SUCCESS;
+ }
}
- save = *a;
- *a = (*a)->a_next;
- attr_free( save );
-
- return( 0 );
+ return LDAP_NO_SUCH_ATTRIBUTE;
}