From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 15 Apr 2008 00:05:06 +0000 (+0000)
Subject: ITS#5450
X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~57
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0c401677f804ab7254a2db52693030b98572765c;p=openldap

ITS#5450
---

diff --git a/CHANGES b/CHANGES
index 03a5a9f5b5..920baf57e1 100644
--- 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 2b01115ef4..8e63506598 100644
--- 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 be604ea2d6..5744b60dcc 100644
--- 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;
 
 			/*