Commit afa78aef authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5375

parent 19fa80f6
......@@ -38,6 +38,7 @@ OpenLDAP 2.4.8 Engineering
Added slapd-bdb/slapd-hdb DB encryption (ITS#5359)
Fixed slapd-ldif delete (ITS#5265)
Fixed slapd-meta link to slapd-ldap (ITS#5355)
Fixed slapd-meta setting of sm_nvalues (ITS#5375)
Fixed slapd-monitor crash (ITS#5311)
Fixed slapd-relay compare (ITS#4937)
Added slapd-sock (ITS#4094)
......
......@@ -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,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment