+ rc = value_add( &(*a)->a_vals, vals );
+
+ if( !rc && nvals ) rc = value_add( &(*a)->a_nvals, nvals );
+ else (*a)->a_nvals = (*a)->a_vals;
+
+ return rc;
+}
+
+int
+attr_merge_normalize(
+ Entry *e,
+ AttributeDescription *desc,
+ BerVarray vals,
+ void *memctx
+) {
+ BerVarray nvals = NULL;
+ int rc;
+
+ if ( desc->ad_type->sat_equality &&
+ desc->ad_type->sat_equality->smr_normalize )
+ {
+ int i;
+
+ for ( i = 0; vals[i].bv_val; i++ );
+
+ nvals = sl_calloc( sizeof(struct berval), i + 1, memctx );
+ for ( i = 0; vals[i].bv_val; i++ ) {
+ rc = (*desc->ad_type->sat_equality->smr_normalize)(
+ SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+ desc->ad_type->sat_syntax,
+ desc->ad_type->sat_equality,
+ &vals[i], &nvals[i], memctx );
+
+ if ( rc != LDAP_SUCCESS ) {
+ nvals[i+1].bv_val = NULL;
+ goto error_return;
+ }
+ }
+ nvals[i].bv_val = NULL;
+ }
+
+ rc = attr_merge( e, desc, vals, nvals );
+
+error_return:;
+ if ( nvals != NULL ) {
+ ber_bvarray_free_x( nvals, memctx );
+ }
+ return rc;