mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-18 11:05:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use attr_merge_normalize() instead of attr_mergeit()

Browse Source 
(Seems to me that attr_mergeit() can be deprecated in favour of the
former -- Howard?)
This commit is contained in:
Luke Howard 2003-04-23 09:50:41 +00:00
parent 83d95b5fc2
commit 4a51d2457a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
servers/slapd/slapi/slapi_utils.c
View File

@ -257,7 +257,7 @@ slapi_entry_attr_merge(
return -1;
}
rc = attr_mergeit( e, ad, bv );
rc = attr_merge_normalize_one( e, ad, bv, NULL );
ch_free( bv );
return rc;
@ -469,7 +469,7 @@ slapi_entry_attr_set_charptr(Slapi_Entry* e, const char *type, const char *value
if ( value != NULL ) {
bv.bv_val = (char *)value;
bv.bv_len = strlen(value);
attr_mergeit_one( e, ad, &bv );
attr_merge_normalize_one( e, ad, &bv, NULL );
}
#endif /* LDAP_SLAPI */
}
@ -602,7 +602,7 @@ slapi_entry_add_valueset(Slapi_Entry *e, const char *type, Slapi_ValueSet *vs)
return -1;
}
return attr_mergeit( e, ad, *vs );
return attr_merge_normalize( e, ad, *vs, NULL );
#else
return -1;
#endif /* LDAP_SLAPI */
@ -686,7 +686,7 @@ slapi_entry_add_value(Slapi_Entry *e, const char *type, const Slapi_Value *value
return -1;
}
rc = attr_mergeit_one( e, ad, (Slapi_Value *)value );
rc = attr_merge_normalize_one( e, ad, (Slapi_Value *)value, NULL );
if ( rc != LDAP_SUCCESS ) {
return -1;
}
@ -798,7 +798,7 @@ slapi_entry_attr_replace_sv( Slapi_Entry *e, const char *type, Slapi_Value **val
return -1;
}
rc = attr_mergeit( e, ad, bv );
rc = attr_merge_normalize( e, ad, bv, NULL );
slapi_ch_free( (void **)&bv );
if ( rc != LDAP_SUCCESS ) {
return -1;