ITS#5119 from HEAD

diff --git a/CHANGES b/CHANGES
index e1b079c88d604de7d3e7fc27de003aee193f2327..6df7a3cf3c743ecc8cb6d85a8a258fa69bd31a0a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ OpenLDAP 2.3 Change Log
 OpenLDAP 2.3.39 Engineering
        Fixed slapd database/overlay config conflict (ITS#4848)
        Fixed slapd password_hash config order (ITS#5082)
+       Fixed slapd slap_mods_check bug (ITS#5119)
        Fixed slapd-bdb DB_CONFIG conversion bug (ITS#5118)
        Fixed slapd-sql concurrency issue (ITS#5095)
        Fixed slapo-pcache and -rwm interaction fix (ITS#4991) 

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index e6dc759f5c9d69b77e517d3150320e73255c870f..2604f072bb07e8bf95747b2eba839eb2aea3c846 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -734,6 +734,7 @@ int slap_mods_check(
                                                        "%s: value #%ld normalization failed",
                                                        ml->sml_type.bv_val, (long) nvals );
                                                *text = textbuf;
+                                               BER_BVZERO( &ml->sml_nvalues[nvals] );
                                                return rc;
                                        }
                                }