Index: openldap2.3-2.4.7/servers/slapd/back-bdb/modify.c
===================================================================
--- openldap2.3-2.4.7.orig/servers/slapd/back-bdb/modify.c	2008-04-22 19:49:23.000000000 +0000
+++ openldap2.3-2.4.7/servers/slapd/back-bdb/modify.c	2008-04-22 19:51:19.000000000 +0000
@@ -283,7 +283,7 @@
 				/* 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 ) {
Index: openldap2.3-2.4.7/servers/slapd/modify.c
===================================================================
--- openldap2.3-2.4.7.orig/servers/slapd/modify.c	2008-04-22 19:48:46.000000000 +0000
+++ openldap2.3-2.4.7/servers/slapd/modify.c	2008-04-22 19:50:44.000000000 +0000
@@ -585,6 +585,7 @@
 					ml->sml_values[nvals] = pval;
 				}
 			}
+			ml->sml_values[nvals].bv_len = 0;
 			ml->sml_numvals = nvals;
 
 			/*