fix ITS#3346

diff --git a/CHANGES b/CHANGES
index bfa4576241a1bbd25390427caab63f909aa50f53..0dbfd798e53ac8dc289bfdab3d37d79392e3b82c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ OpenLDAP 2.2.18 Engineering
        Fixed slapd matching rule name sensitivity
        Fixed slapd referral memory leak
        Fixed slapd mods2entry memory leak
+       Fixed slapd multiple value delete (ITS#3346)
        Updated back-sql
 
 OpenLDAP 2.2.17 Release

diff --git a/servers/slapd/mods.c b/servers/slapd/mods.c
index bda5738a47c774f5dbb8f7ff173b0bc72eacb185..00ae400788b0920b7851aa883c28b06c1f9e0ceb 100644 (file)
--- a/servers/slapd/mods.c
+++ b/servers/slapd/mods.c
@@ -219,9 +219,13 @@ modify_delete_values(
                return LDAP_NO_SUCH_ATTRIBUTE;
        }
 
-       for ( i = 0; mod->sm_values[i].bv_val != NULL; i++ ) {
+       for ( i = 0; !BER_BVISNULL( &mod->sm_values[i] ); i++ ) {
                int     found = 0;
-               for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
+               for ( j = 0; !BER_BVISNULL( &a->a_vals[j] ); j++ ) {
+                       /* skip already deleted values */
+                       if ( a->a_vals[j].bv_val == &dummy ) {
+                               continue;
+                       }
 
                        if( mod->sm_nvalues ) {
                                assert( a->a_nvals );