mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08:00
rework of slap_mods2entry dup
This commit is contained in:
parent
c7d4f2841e
commit
dda85fafe9
@ -422,24 +422,32 @@ slap_mods2entry(
|
||||
|
||||
/* should check for duplicates */
|
||||
|
||||
if ( dup ) {
|
||||
for ( j = 0; mods->sml_values[j].bv_val; j++ ) {
|
||||
ber_dupbv( &attr->a_vals[i+j], &mods->sml_values[j] );
|
||||
}
|
||||
BER_BVZERO( &attr->a_vals[i+j] );
|
||||
} else {
|
||||
AC_MEMCPY( &attr->a_vals[i], mods->sml_values,
|
||||
sizeof( struct berval ) * j );
|
||||
|
||||
/* trim the mods array */
|
||||
ch_free( mods->sml_values );
|
||||
mods->sml_values = NULL;
|
||||
}
|
||||
|
||||
if( mods->sml_nvalues ) {
|
||||
attr->a_nvals = ch_realloc( attr->a_nvals,
|
||||
sizeof( struct berval ) * (i+j) );
|
||||
|
||||
if ( dup ) {
|
||||
for ( j = 0; mods->sml_nvalues[j].bv_val; j++ ) {
|
||||
ber_dupbv( &attr->a_nvals[i+j], &mods->sml_nvalues[j] );
|
||||
}
|
||||
BER_BVZERO( &attr->a_nvals[i+j] );
|
||||
} else {
|
||||
AC_MEMCPY( &attr->a_nvals[i], mods->sml_nvalues,
|
||||
sizeof( struct berval ) * j );
|
||||
|
||||
/* trim the mods array */
|
||||
ch_free( mods->sml_nvalues );
|
||||
mods->sml_nvalues = NULL;
|
||||
|
||||
}
|
||||
} else {
|
||||
attr->a_nvals = attr->a_vals;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user