mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08:00
don't set sm_nvalues unless required (ITS#5375)
This commit is contained in:
parent
c8d5bcf0c7
commit
2df4675ac3
@ -2042,7 +2042,9 @@ next_attr:;
|
||||
mod.sm_desc = (*ap)->a_desc;
|
||||
mod.sm_type = mod.sm_desc->ad_cname;
|
||||
mod.sm_values = (*tap)->a_vals;
|
||||
mod.sm_nvalues = (*tap)->a_nvals;
|
||||
if ( (*tap)->a_nvals != (*tap)->a_vals ) {
|
||||
mod.sm_nvalues = (*tap)->a_nvals;
|
||||
}
|
||||
|
||||
(void)modify_add_values( &e, &mod,
|
||||
/* permissive */ 1,
|
||||
|
@ -1227,7 +1227,9 @@ cleanup_attr:;
|
||||
mod.sm_type = mod.sm_desc->ad_cname;
|
||||
mod.sm_numvals = (*tap)->a_numvals;
|
||||
mod.sm_values = (*tap)->a_vals;
|
||||
mod.sm_nvalues = (*tap)->a_nvals;
|
||||
if ( (*tap)->a_nvals != (*tap)->a_vals ) {
|
||||
mod.sm_nvalues = (*tap)->a_nvals;
|
||||
}
|
||||
|
||||
(void)modify_add_values( &e, &mod,
|
||||
/* permissive */ 1,
|
||||
@ -1614,6 +1616,7 @@ rwm_db_config(
|
||||
fname, lineno, argv[ 1 ] );
|
||||
return 1;
|
||||
}
|
||||
|
||||
} else if ( strcasecmp( argv[0], "normalize-mapped-attrs" ) == 0 ) {
|
||||
if ( argc !=2 ) {
|
||||
fprintf( stderr,
|
||||
|
Loading…
Reference in New Issue
Block a user