]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-bdb/modify.c
Don't crash if attr_find() fails (Howard, you might like to review this)
[openldap] / servers / slapd / back-bdb / modify.c
index 965bb0b0980dc13d514741dd9d355f3062397343..f84f2074794edc75f1d7347f574b6734cb4e6349 100644 (file)
@@ -1,7 +1,7 @@
 /* modify.c - bdb backend modify routine */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
 #include "back-bdb.h"
 #include "external.h"
 
+#define INDEXED        0x2000
+#define NULLIFIED      0x4000
+
 int bdb_modify_internal(
-       BackendDB *be,
-       Connection *conn,
        Operation *op,
        DB_TXN *tid,
        Modifications *modlist,
@@ -39,10 +40,11 @@ int bdb_modify_internal(
                e->e_id, e->e_dn, 0);
 #endif
 
-       if ( !acl_check_modlist( be, conn, op, e, modlist )) {
+       if ( !acl_check_modlist( op, e, modlist )) {
                return LDAP_INSUFFICIENT_ACCESS;
        }
 
+       /* save_attrs will be disposed of by bdb_cache_modify */
        save_attrs = e->e_attrs;
        e->e_attrs = attrs_dup( e->e_attrs );
 
@@ -56,7 +58,8 @@ int bdb_modify_internal(
 #else
                        Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: add\n", 0, 0, 0);
 #endif
-                       err = modify_add_values( e, mod, text, textbuf, textlen );
+                       err = modify_add_values( e, mod, get_permissiveModify(op),
+                               text, textbuf, textlen );
                        if( err != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
                                LDAP_LOG ( OPERATION, ERR, 
@@ -75,7 +78,8 @@ int bdb_modify_internal(
 #else
                        Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: delete\n", 0, 0, 0);
 #endif
-                       err = modify_delete_values( e, mod, text, textbuf, textlen );
+                       err = modify_delete_values( e, mod, get_permissiveModify(op),
+                               text, textbuf, textlen );
                        assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
                        if( err != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
@@ -95,7 +99,8 @@ int bdb_modify_internal(
 #else
                        Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: replace\n", 0, 0, 0);
 #endif
-                       err = modify_replace_values( e, mod, text, textbuf, textlen );
+                       err = modify_replace_values( e, mod, get_permissiveModify(op),
+                               text, textbuf, textlen );
                        if( err != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
                                LDAP_LOG ( OPERATION, ERR, 
@@ -119,7 +124,11 @@ int bdb_modify_internal(
                         */
                        mod->sm_op = LDAP_MOD_ADD;
 
-                       err = modify_add_values( e, mod, text, textbuf, textlen );
+                       err = modify_add_values( e, mod, get_permissiveModify(op),
+                               text, textbuf, textlen );
+
+                       mod->sm_op = SLAP_MOD_SOFTADD;
+
                        if ( err == LDAP_TYPE_OR_VALUE_EXISTS ) {
                                err = LDAP_SUCCESS;
                        }
@@ -165,21 +174,10 @@ int bdb_modify_internal(
                if ( mod->sm_desc == slap_schema.si_ad_objectClass ) {
                        e->e_ocflags = 0;
                }
-
-               /* check if modified attribute was indexed
-                * but not in case of NOOP... */
-               err = bdb_index_is_indexed( be, mod->sm_desc );
-               if ( err == LDAP_SUCCESS && !op->o_noop ) {
-                       ap = attr_find( save_attrs, mod->sm_desc );
-                       if ( ap ) ap->a_flags |= SLAP_ATTR_IXDEL;
-
-                       ap = attr_find( e->e_attrs, mod->sm_desc );
-                       if ( ap ) ap->a_flags |= SLAP_ATTR_IXADD;
-               }
        }
 
        /* check that the entry still obeys the schema */
-       rc = entry_schema_check( be, e, save_attrs, text, textbuf, textlen );
+       rc = entry_schema_check( op->o_bd, e, save_attrs, text, textbuf, textlen );
        if ( rc != LDAP_SUCCESS || op->o_noop ) {
                attrs_free( e->e_attrs );
                e->e_attrs = save_attrs;
@@ -201,50 +199,84 @@ int bdb_modify_internal(
        }
 
        /* update the indices of the modified attributes */
-
-       /* start with deleting the old index entries */
-       for ( ap = save_attrs; ap != NULL; ap = ap->a_next ) {
-               if ( ap->a_flags & SLAP_ATTR_IXDEL ) {
-                       rc = bdb_index_values( be, tid, ap->a_desc, ap->a_vals,
-                                              e->e_id, SLAP_INDEX_DELETE_OP );
-                       if ( rc != LDAP_SUCCESS ) {
-                               attrs_free( e->e_attrs );
-                               e->e_attrs = save_attrs;
-#ifdef NEW_LOGGING
-                               LDAP_LOG ( OPERATION, ERR, 
-                                       "bdb_modify_internal: attribute index delete failure\n",
-                                       0, 0, 0 );
-#else
-                               Debug( LDAP_DEBUG_ANY,
-                                      "Attribute index delete failure",
-                                      0, 0, 0 );
-#endif
-                               return rc;
+       if ( !op->o_noop ) {
+               Modifications *m2;
+
+               /* First look for any deletes that would nullify any adds
+                * in this request. I.e., deleting an entire attribute after
+                * assigning some values to it.
+                */
+               for ( ml = modlist; ml != NULL; ml = ml->sml_next ) {
+                       if (bdb_index_is_indexed( op->o_bd, ml->sml_desc ))
+                               continue;
+                       switch ( ml->sml_op ) {
+                       case LDAP_MOD_DELETE:
+                               /* If just deleting specific values, ignore */
+                               if ( ml->sml_bvalues ) break;
+                       case LDAP_MOD_REPLACE:
+                               for ( m2 = modlist; m2 != ml; m2 = m2->sml_next ) {
+                                       if ( m2->sml_desc == ml->sml_desc &&
+                                               m2->sml_op != LDAP_MOD_DELETE )
+                                               m2->sml_op |= NULLIFIED;
+                               }
+                               break;
                        }
-                       ap->a_flags &= ~SLAP_ATTR_IXDEL;
+                       ml->sml_op |= INDEXED;
                }
-       }
-
-       /* add the new index entries */
-       for ( ap = e->e_attrs; ap != NULL; ap = ap->a_next ) {
-               if (ap->a_flags & SLAP_ATTR_IXADD) {
-                       rc = bdb_index_values( be, tid, ap->a_desc, ap->a_vals,
-                                              e->e_id, SLAP_INDEX_ADD_OP );
+               /* Now index the modifications */
+               for ( ml = modlist; ml != NULL; ml = ml->sml_next ) {
+                       if ( ! (ml->sml_op & INDEXED) ) continue;
+                       ml->sml_op ^= INDEXED;
+                       switch ( ml->sml_op ) {
+                       case LDAP_MOD_DELETE:
+                               if ( ml->sml_bvalues ) {
+                                       rc = bdb_index_values( op, tid, ml->sml_desc,
+                                               ml->sml_nvalues ? ml->sml_nvalues : ml->sml_bvalues,
+                                               e->e_id, SLAP_INDEX_DELETE_OP );
+                                       break;
+                               }
+                               /* FALLTHRU */
+                       case LDAP_MOD_REPLACE:
+                       /* A nullified replace still does its delete action */
+                       case LDAP_MOD_REPLACE | NULLIFIED:
+                               ap = attr_find( save_attrs, ml->sml_desc );
+                               if ( ap != NULL ) {
+                                       rc = bdb_index_values( op, tid, ap->a_desc,
+                                               ap->a_nvals,
+                                               e->e_id, SLAP_INDEX_DELETE_OP );
+                               } else {
+                                       rc = LDAP_SUCCESS;
+                               }
+                               if ( rc || ml->sml_op == LDAP_MOD_DELETE ||
+                                       (ml->sml_op & NULLIFIED))
+                                       break;
+                               /* FALLTHRU */
+                       case LDAP_MOD_ADD:
+                       case SLAP_MOD_SOFTADD:
+                               rc = bdb_index_values( op, tid, ml->sml_desc,
+                                       ml->sml_nvalues ? ml->sml_nvalues : ml->sml_bvalues,
+                                       e->e_id, SLAP_INDEX_ADD_OP );
+                               break;
+                       }
+                       ml->sml_op &= ~NULLIFIED;
                        if ( rc != LDAP_SUCCESS ) {
                                attrs_free( e->e_attrs );
                                e->e_attrs = save_attrs;
 #ifdef NEW_LOGGING
                                LDAP_LOG ( OPERATION, ERR, 
-                                       "bdb_modify_internal: attribute index add failure\n", 
+                                       "bdb_modify_internal: attribute index update failure\n",
                                        0, 0, 0 );
 #else
                                Debug( LDAP_DEBUG_ANY,
-                                      "Attribute index add failure",
+                                      "Attribute index update failure",
                                       0, 0, 0 );
 #endif
-                               return rc;
+                               /* reset our flags */
+                               for (; ml; ml=ml->sml_next ) {
+                                       ml->sml_op &= ~(INDEXED | NULLIFIED);
+                               }
+                               break;
                        }
-                       ap->a_flags &= ~SLAP_ATTR_IXADD;
                }
        }
 
@@ -253,41 +285,39 @@ int bdb_modify_internal(
 
 
 int
-bdb_modify(
-       BackendDB       *be,
-       Connection      *conn,
-       Operation       *op,
-       struct berval   *dn,
-       struct berval   *ndn,
-       Modifications   *modlist )
+bdb_modify( Operation *op, SlapReply *rs )
 {
-       struct bdb_info *bdb = (struct bdb_info *) be->be_private;
-       int rc;
-       Entry           *matched = NULL;
+       struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
        Entry           *e = NULL;
+       EntryInfo       *ei = NULL;
        int             manageDSAit = get_manageDSAit( op );
-       const char *text = NULL;
        char textbuf[SLAP_TEXT_BUFLEN];
        size_t textlen = sizeof textbuf;
-       DB_TXN  *ltid = NULL;
+       DB_TXN  *ltid = NULL, *lt2;
        struct bdb_op_info opinfo;
+       Entry           dummy;
 
-       u_int32_t       locker;
+       u_int32_t       locker = 0;
        DB_LOCK         lock;
 
        int             noop = 0;
 
+#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
+       Operation* ps_list;
+       struct psid_entry *pm_list, *pm_prev;
+#endif
+
 #ifdef NEW_LOGGING
-       LDAP_LOG ( OPERATION, ENTRY, "bdb_modify: %s\n", dn->bv_val, 0, 0 );
+       LDAP_LOG ( OPERATION, ENTRY, "bdb_modify: %s\n", op->o_req_dn.bv_val, 0, 0 );
 #else
-       Debug( LDAP_DEBUG_ARGS, "bdb_modify: %s\n", dn->bv_val, 0, 0 );
+       Debug( LDAP_DEBUG_ARGS, "bdb_modify: %s\n", op->o_req_dn.bv_val, 0, 0 );
 #endif
 
        if( 0 ) {
 retry: /* transaction retry */
                if( e != NULL ) {
-                       bdb_cache_delete_entry(&bdb->bi_cache, e);
                        bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
+                       e = NULL;
                }
 #ifdef NEW_LOGGING
                LDAP_LOG ( OPERATION, DETAIL1, "bdb_modify: retrying...\n", 0, 0, 0 );
@@ -295,101 +325,115 @@ retry:  /* transaction retry */
                Debug(LDAP_DEBUG_TRACE,
                        "bdb_modify: retrying...\n", 0, 0, 0);
 #endif
-               rc = TXN_ABORT( ltid );
+
+#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
+               pm_list = LDAP_LIST_FIRST(&op->o_pm_list);
+               while ( pm_list != NULL ) {
+                       LDAP_LIST_REMOVE ( pm_list, ps_link );
+                       pm_prev = pm_list;
+                       pm_list = LDAP_LIST_NEXT ( pm_list, ps_link );
+                       ch_free( pm_prev );
+               }
+#endif
+
+               rs->sr_err = TXN_ABORT( ltid );
                ltid = NULL;
                op->o_private = NULL;
-               if( rc != 0 ) {
-                       rc = LDAP_OTHER;
-                       text = "internal error";
+               op->o_do_not_cache = opinfo.boi_acl_cache;
+               if( rs->sr_err != 0 ) {
+                       rs->sr_err = LDAP_OTHER;
+                       rs->sr_text = "internal error";
                        goto return_results;
                }
                ldap_pvt_thread_yield();
        }
 
        /* begin transaction */
-       rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &ltid, 
+       rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, NULL, &ltid, 
                bdb->bi_db_opflags );
-       text = NULL;
-       if( rc != 0 ) {
+       rs->sr_text = NULL;
+       if( rs->sr_err != 0 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG ( OPERATION, DETAIL1, 
-                       "bdb_modify: txn_begin failed: %s (%d)\n", db_strerror(rc), rc, 0 );
+                       "bdb_modify: txn_begin failed: %s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modify: txn_begin failed: %s (%d)\n",
-                       db_strerror(rc), rc, 0 );
+                       db_strerror(rs->sr_err), rs->sr_err, 0 );
 #endif
-               rc = LDAP_OTHER;
-               text = "internal error";
+               rs->sr_err = LDAP_OTHER;
+               rs->sr_text = "internal error";
                goto return_results;
        }
 
        locker = TXN_ID ( ltid );
 
-       opinfo.boi_bdb = be;
+       opinfo.boi_bdb = op->o_bd;
        opinfo.boi_txn = ltid;
+       opinfo.boi_locker = locker;
        opinfo.boi_err = 0;
+       opinfo.boi_acl_cache = op->o_do_not_cache;
        op->o_private = &opinfo;
 
-       /* get entry */
-       rc = bdb_dn2entry_w( be, ltid, ndn, &e, &matched, 0, locker, &lock );
+       /* get entry or ancestor */
+       rs->sr_err = bdb_dn2entry( op->o_bd, ltid, &op->o_req_ndn, &ei, 1,
+               locker, &lock, op->o_tmpmemctx );
 
-       if ( rc != 0 ) {
+       if ( rs->sr_err != 0 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG ( OPERATION, DETAIL1, 
-                       "bdb_modify: dn2entry failed: (%d)\n", rc, 0, 0 );
+                       "bdb_modify: dn2entry failed: (%d)\n", rs->sr_err, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modify: dn2entry failed (%d)\n",
-                       rc, 0, 0 );
+                       rs->sr_err, 0, 0 );
 #endif
-               switch( rc ) {
+               switch( rs->sr_err ) {
                case DB_LOCK_DEADLOCK:
                case DB_LOCK_NOTGRANTED:
                        goto retry;
                case DB_NOTFOUND:
                        break;
                case LDAP_BUSY:
-                       text = "ldap server busy";
+                       rs->sr_text = "ldap server busy";
                        goto return_results;
                default:
-                       rc = LDAP_OTHER;
+                       rs->sr_err = LDAP_OTHER;
+                       rs->sr_text = "internal error";
+                       goto return_results;
                }
-               text = "internal error";
-               goto return_results;
        }
 
+       e = ei->bei_e;
        /* acquire and lock entry */
-       if ( e == NULL ) {
-               char* matched_dn = NULL;
-               BerVarray refs;
-
-               if ( matched != NULL ) {
-                       matched_dn = ch_strdup( matched->e_dn );
-                       refs = is_entry_referral( matched )
-                               ? get_entry_referrals( be, conn, op, matched )
+       if ( rs->sr_err == DB_NOTFOUND ) {
+               if ( e != NULL ) {
+                       rs->sr_matched = ch_strdup( e->e_dn );
+                       rs->sr_ref = is_entry_referral( e )
+                               ? get_entry_referrals( op, e )
                                : NULL;
-                       bdb_unlocked_cache_return_entry_r (&bdb->bi_cache, matched);
-                       matched = NULL;
+                       bdb_unlocked_cache_return_entry_r (&bdb->bi_cache, e);
+                       e = NULL;
 
                } else {
-                       refs = referral_rewrite( default_referral,
-                               NULL, dn, LDAP_SCOPE_DEFAULT );
+                       rs->sr_ref = referral_rewrite( default_referral,
+                               NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
                }
 
-               send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-                       matched_dn, NULL, refs, NULL );
+               rs->sr_err = LDAP_REFERRAL;
+               send_ldap_result( op, rs );
 
-               ber_bvarray_free( refs );
-               free( matched_dn );
+               ber_bvarray_free( rs->sr_ref );
+               free( (char *)rs->sr_matched );
+               rs->sr_ref = NULL;
+               rs->sr_matched = NULL;
 
                goto done;
        }
 
        if ( !manageDSAit && is_entry_referral( e ) ) {
                /* entry is a referral, don't allow modify */
-               BerVarray refs = get_entry_referrals( be,
-                       conn, op, e );
+               rs->sr_ref = get_entry_referrals( op, e );
 
 #ifdef NEW_LOGGING
                LDAP_LOG ( OPERATION, DETAIL1, "bdb_modify: entry is referral\n", 0, 0, 0 );
@@ -399,27 +443,59 @@ retry:    /* transaction retry */
                        0, 0, 0 );
 #endif
 
-               send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-                       e->e_dn, NULL, refs, NULL );
+               rs->sr_err = LDAP_REFERRAL;
+               rs->sr_matched = e->e_name.bv_val;
+               send_ldap_result( op, rs );
 
-               ber_bvarray_free( refs );
+               ber_bvarray_free( rs->sr_ref );
+               rs->sr_ref = NULL;
+               rs->sr_matched = NULL;
                goto done;
        }
+
+#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
+       if ( rs->sr_err == LDAP_SUCCESS && !op->o_noop ) {
+               LDAP_LIST_FOREACH ( ps_list, &bdb->bi_psearch_list, o_ps_link ) {
+                       bdb_psearch(op, rs, ps_list, e, LDAP_PSEARCH_BY_PREMODIFY );
+               }
+       }
+#endif
        
+       /* nested transaction */
+       rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, ltid, &lt2, 
+               bdb->bi_db_opflags );
+       rs->sr_text = NULL;
+       if( rs->sr_err != 0 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG ( OPERATION, ERR, 
+                       "bdb_modify: txn_begin(2) failed: %s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
+#else
+               Debug( LDAP_DEBUG_TRACE,
+                       "bdb_modify: txn_begin(2) failed: %s (%d)\n",
+                       db_strerror(rs->sr_err), rs->sr_err, 0 );
+#endif
+               rs->sr_err = LDAP_OTHER;
+               rs->sr_text = "internal error";
+               goto return_results;
+       }
        /* Modify the entry */
-       rc = bdb_modify_internal( be, conn, op, ltid, modlist, e,
-               &text, textbuf, textlen );
+       dummy = *e;
+       rs->sr_err = bdb_modify_internal( op, lt2, op->oq_modify.rs_modlist,
+               &dummy, &rs->sr_text, textbuf, textlen );
 
-       if( rc != LDAP_SUCCESS ) {
+       if( rs->sr_err != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
                LDAP_LOG ( OPERATION, ERR, 
-                       "bdb_modify: modify failed (%d)\n", rc, 0, 0 );
+                       "bdb_modify: modify failed (%d)\n", rs->sr_err, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modify: modify failed (%d)\n",
-                       rc, 0, 0 );
+                       rs->sr_err, 0, 0 );
 #endif
-               switch( rc ) {
+               if ( (rs->sr_err == LDAP_INSUFFICIENT_ACCESS) && opinfo.boi_err ) {
+                       rs->sr_err = opinfo.boi_err;
+               }
+               switch( rs->sr_err ) {
                case DB_LOCK_DEADLOCK:
                case DB_LOCK_NOTGRANTED:
                        goto retry;
@@ -428,51 +504,57 @@ retry:    /* transaction retry */
        }
 
        /* change the entry itself */
-       rc = bdb_id2entry_update( be, ltid, e );
-       if ( rc != 0 ) {
+       rs->sr_err = bdb_id2entry_update( op->o_bd, lt2, &dummy );
+       if ( rs->sr_err != 0 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG ( OPERATION, ERR, 
-                       "bdb_modify: id2entry update failed (%d)\n", rc, 0, 0 );
+                       "bdb_modify: id2entry update failed (%d)\n", rs->sr_err, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modify: id2entry update failed (%d)\n",
-                       rc, 0, 0 );
+                       rs->sr_err, 0, 0 );
 #endif
-               switch( rc ) {
+               switch( rs->sr_err ) {
                case DB_LOCK_DEADLOCK:
                case DB_LOCK_NOTGRANTED:
                        goto retry;
                }
-               text = "entry update failed";
+               rs->sr_text = "entry update failed";
+               goto return_results;
+       }
+       if ( TXN_COMMIT( lt2, 0 ) != 0 ) {
+               rs->sr_err = LDAP_OTHER;
+               rs->sr_text = "txn_commit(2) failed";
                goto return_results;
        }
 
        if( op->o_noop ) {
-               if ( ( rc = TXN_ABORT( ltid ) ) != 0 ) {
-                       text = "txn_abort (no-op) failed";
+               if ( ( rs->sr_err = TXN_ABORT( ltid ) ) != 0 ) {
+                       rs->sr_text = "txn_abort (no-op) failed";
                } else {
                        noop = 1;
-                       rc = LDAP_SUCCESS;
+                       rs->sr_err = LDAP_SUCCESS;
                }
        } else {
-               rc = TXN_COMMIT( ltid, 0 );
+               bdb_cache_modify( e, dummy.e_attrs, bdb->bi_dbenv, locker, &lock );
+               rs->sr_err = TXN_COMMIT( ltid, 0 );
        }
        ltid = NULL;
        op->o_private = NULL;
 
-       if( rc != 0 ) {
+       if( rs->sr_err != 0 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG ( OPERATION, ERR, 
                        "bdb_modify: txn_%s failed %s (%d)\n", 
-                       op->o_noop ? "abort (no_op)" : "commit", db_strerror(rc), rc );
+                       op->o_noop ? "abort (no_op)" : "commit", db_strerror(rs->sr_err), rs->sr_err );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modify: txn_%s failed: %s (%d)\n",
                        op->o_noop ? "abort (no-op)" : "commit",
-                       db_strerror(rc), rc );
+                       db_strerror(rs->sr_err), rs->sr_err );
 #endif
-               rc = LDAP_OTHER;
-               text = "commit failed";
+               rs->sr_err = LDAP_OTHER;
+               rs->sr_text = "commit failed";
 
        } else {
 #ifdef NEW_LOGGING
@@ -485,15 +567,32 @@ retry:    /* transaction retry */
                        op->o_noop ? " (no-op)" : "",
                        e->e_id, e->e_dn );
 #endif
-               rc = LDAP_SUCCESS;
-               text = NULL;
+               rs->sr_err = LDAP_SUCCESS;
+               rs->sr_text = NULL;
        }
 
 return_results:
-       send_ldap_result( conn, op, rc,
-               NULL, text, NULL, NULL );
+       send_ldap_result( op, rs );
+
+#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
+       if ( rs->sr_err == LDAP_SUCCESS && !op->o_noop ) {
+               /* Loop through in-scope entries for each psearch spec */
+               LDAP_LIST_FOREACH ( ps_list, &bdb->bi_psearch_list, o_ps_link ) {
+                       bdb_psearch( op, rs, ps_list, e, LDAP_PSEARCH_BY_MODIFY );
+               }
+               pm_list = LDAP_LIST_FIRST(&op->o_pm_list);
+               while ( pm_list != NULL ) {
+                       bdb_psearch(op, rs, pm_list->ps_op,
+                                               e, LDAP_PSEARCH_BY_SCOPEOUT);
+                       LDAP_LIST_REMOVE ( pm_list, ps_link );
+                       pm_prev = pm_list;
+                       pm_list = LDAP_LIST_NEXT ( pm_list, ps_link );
+                       ch_free( pm_prev );
+               }
+       }
+#endif
 
-       if( rc == LDAP_SUCCESS && bdb->bi_txn_cp ) {
+       if( rs->sr_err == LDAP_SUCCESS && bdb->bi_txn_cp ) {
                ldap_pvt_thread_yield();
                TXN_CHECKPOINT( bdb->bi_dbenv,
                        bdb->bi_txn_cp_kbyte, bdb->bi_txn_cp_min, 0 );
@@ -501,6 +600,15 @@ return_results:
 
 done:
        if( ltid != NULL ) {
+#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
+               pm_list = LDAP_LIST_FIRST(&op->o_pm_list);
+               while ( pm_list != NULL ) {
+                       LDAP_LIST_REMOVE ( pm_list, ps_link );
+                       pm_prev = pm_list;
+                       pm_list = LDAP_LIST_NEXT ( pm_list, ps_link );
+                       ch_free( pm_prev );
+               }
+#endif
                TXN_ABORT( ltid );
                op->o_private = NULL;
        }
@@ -508,5 +616,5 @@ done:
        if( e != NULL ) {
                bdb_unlocked_cache_return_entry_w (&bdb->bi_cache, e);
        }
-       return ( ( rc == LDAP_SUCCESS ) ? noop : rc );
+       return ( ( rs->sr_err == LDAP_SUCCESS ) ? noop : rs->sr_err );
 }