ITS#5450

diff --git a/CHANGES b/CHANGES
index 03a5a9f5b509b8526d07bc7595973f766f9577bc..920baf57e16b579e95c3e0b3999544489f25576e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,7 @@ OpenLDAP 2.4.9 Engineering
        Fixed slapd syncrepl crash on empty CSN (ITS#5432)
        Fixed slapd syncrepl refreshAndPersist (ITS#5454)
        Fixed slapd syncrepl modrdn processing (ITS#5397)
+       Fixed slapd value list termination (ITS#5450)
        Fixed slapd/slapo-accesslog rq mutex usage (ITS#5442)
        Fixed slapd-bdb ID_NOCACHE handling (ITS#5439)
        Fixed slapd-ldap connection handler (ITS#5404)

diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c
index 2b01115ef4937fb749318c1bcf13fb7f4937766a..8e63506598e3f67f1038b11d9554a70cd3715371 100644 (file)
--- a/servers/slapd/back-bdb/modify.c
+++ b/servers/slapd/back-bdb/modify.c
@@ -283,7 +283,7 @@ int bdb_modify_internal(
                                /* attribute was completely deleted */
                                vals = ap->a_nvals;
                        }
-                       if ( !BER_BVISEMPTY( vals )) {
+                       if ( !BER_BVISNULL( vals )) {
                                rc = bdb_index_values( op, tid, ap->a_desc,
                                        vals, e->e_id, SLAP_INDEX_DELETE_OP );
                                if ( rc != LDAP_SUCCESS ) {

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index be604ea2d61bc66bc21421b588073724ee36f937..5744b60dcc446320465a23a10c8abeb4aa3dfef4 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -589,6 +589,7 @@ int slap_mods_check(
                                        ml->sml_values[nvals] = pval;
                                }
                        }
+                       ml->sml_values[nvals].bv_len = 0;
                        ml->sml_numvals = nvals;
 
                        /*