Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_5

[openldap] / servers / slapd / back-bdb / modify.c

diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c
index 3cab8770eea34e91ac93e0f023e875bf4a458f4c..3a81d9021764f1eb18b96dabf60f5e8b3f73d9ba 100644 (file)
--- a/servers/slapd/back-bdb/modify.c
+++ b/servers/slapd/back-bdb/modify.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2013 The OpenLDAP Foundation.
+ * Copyright 2000-2014 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -389,6 +389,7 @@ int bdb_modify_internal(
                                        ap->a_nvals,
                                        e->e_id, SLAP_INDEX_ADD_OP );
                        } else {
+                               int found = 0;
                                /* if this was only an add, we only need to index
                                 * the added values.
                                 */
@@ -396,6 +397,7 @@ int bdb_modify_internal(
                                        struct berval *vals;
                                        if ( ml->sml_desc != ap->a_desc || !ml->sml_numvals )
                                                continue;
+                                       found = 1;
                                        switch( ml->sml_op ) {
                                        case LDAP_MOD_ADD:
                                        case LDAP_MOD_REPLACE:
@@ -415,6 +417,15 @@ int bdb_modify_internal(
                                        if ( rc )
                                                break;
                                }
+                               /* This attr was affected by a modify of a subtype, so
+                                * there was no direct match in the modlist. Just readd
+                                * all of its values.
+                                */
+                               if ( !found ) {
+                                       rc = bdb_index_values( op, tid, ap->a_desc,
+                                               ap->a_nvals,
+                                               e->e_id, SLAP_INDEX_ADD_OP );
+                               }
                        }
                        if ( rc != LDAP_SUCCESS ) {
                                Debug( LDAP_DEBUG_ANY,