]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-bdb/delete.c
use slab memory for proxyauthz
[openldap] / servers / slapd / back-bdb / delete.c
index e81a3567a351dbef3fda5987c4d1e8926ae53e09..a8d144b6312dd27544e9b22800fcab57249984ee 100644 (file)
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2004 The OpenLDAP Foundation.
+ * Copyright 2000-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -19,8 +19,8 @@
 #include <stdio.h>
 #include <ac/string.h>
 
+#include "lutil.h"
 #include "back-bdb.h"
-#include "external.h"
 
 int
 bdb_delete( Operation *op, SlapReply *rs )
@@ -35,31 +35,37 @@ bdb_delete( Operation *op, SlapReply *rs )
        AttributeDescription *children = slap_schema.si_ad_children;
        AttributeDescription *entry = slap_schema.si_ad_entry;
        DB_TXN          *ltid = NULL, *lt2;
-       struct bdb_op_info opinfo;
+       struct bdb_op_info opinfo = {0};
+       ID      eid;
 
        u_int32_t       locker = 0;
        DB_LOCK         lock, plock;
 
        int             num_retries = 0;
 
-       Operation* ps_list;
        int     rc;
-       EntryInfo   *suffix_ei;
-       Entry       *ctxcsn_e;
-       int         ctxcsn_added = 0;
 
+       LDAPControl **preread_ctrl = NULL;
        LDAPControl *ctrls[SLAP_MAX_RESPONSE_CONTROLS];
        int num_ctrls = 0;
 
        int     parent_is_glue = 0;
        int parent_is_leaf = 0;
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( OPERATION, ARGS,  "==> bdb_delete: %s\n", op->o_req_dn.bv_val, 0, 0 );
-#else
-       Debug( LDAP_DEBUG_ARGS, "==> bdb_delete: %s\n",
+       ctrls[num_ctrls] = 0;
+
+       Debug( LDAP_DEBUG_ARGS, "==> " LDAP_XSTRING(bdb_delete) ": %s\n",
                op->o_req_dn.bv_val, 0, 0 );
-#endif
+
+       /* allocate CSN */
+       if ( !SLAP_SHADOW( op->o_bd )) {
+               struct berval csn;
+               char csnbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];
+
+               csn.bv_val = csnbuf;
+               csn.bv_len = sizeof(csnbuf);
+               slap_get_csn( op, &csn, 1 );
+       }
 
        if( 0 ) {
 retry: /* transaction retry */
@@ -67,13 +73,13 @@ retry:      /* transaction retry */
                        bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
                        e = NULL;
                }
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, DETAIL1, 
-                       "==> bdb_delete: retrying...\n", 0, 0, 0 );
-#else
-               Debug( LDAP_DEBUG_TRACE, "==> bdb_delete: retrying...\n",
+               if( p != NULL ) {
+                       bdb_unlocked_cache_return_entry_r(&bdb->bi_cache, p);
+                       p = NULL;
+               }
+               Debug( LDAP_DEBUG_TRACE,
+                       "==> " LDAP_XSTRING(bdb_delete) ": retrying...\n",
                        0, 0, 0 );
-#endif
                rs->sr_err = TXN_ABORT( ltid );
                ltid = NULL;
                op->o_private = NULL;
@@ -83,6 +89,10 @@ retry:       /* transaction retry */
                        rs->sr_text = "internal error";
                        goto return_results;
                }
+               if ( op->o_abandon ) {
+                       rs->sr_err = SLAPD_ABANDON;
+                       goto return_results;
+               }
                parent_is_glue = 0;
                parent_is_leaf = 0;
                ldap_pvt_thread_yield();
@@ -94,15 +104,9 @@ retry:      /* transaction retry */
                bdb->bi_db_opflags );
        rs->sr_text = NULL;
        if( rs->sr_err != 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, ERR, 
-                       "==> bdb_delete: txn_begin failed: %s (%d)\n",
-                       db_strerror(rs->sr_err), rs->sr_err, 0 );
-#else
                Debug( LDAP_DEBUG_TRACE,
-                       "bdb_delete: txn_begin failed: %s (%d)\n",
-                       db_strerror(rs->sr_err), rs->sr_err, 0 );
-#endif
+                       LDAP_XSTRING(bdb_delete) ": txn_begin failed: "
+                       "%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
                rs->sr_err = LDAP_OTHER;
                rs->sr_text = "internal error";
                goto return_results;
@@ -150,14 +154,9 @@ retry:     /* transaction retry */
 
        /* FIXME : dn2entry() should return non-glue entry */
        if ( e == NULL || ( !manageDSAit && is_entry_glue( e ))) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, ARGS, 
-                       "<=- bdb_delete: no such object %s\n", op->o_req_dn.bv_val, 0, 0);
-#else
                Debug( LDAP_DEBUG_ARGS,
-                       "<=- bdb_delete: no such object %s\n",
+                       "<=- " LDAP_XSTRING(bdb_delete) ": no such object %s\n",
                        op->o_req_dn.bv_val, 0, 0);
-#endif
 
                if ( matched != NULL ) {
                        rs->sr_matched = ch_strdup( matched->e_dn );
@@ -168,48 +167,35 @@ retry:    /* transaction retry */
                        matched = NULL;
 
                } else {
-                       BerVarray deref = NULL;
-                       if ( !LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
-                               syncinfo_t *si;
-                               LDAP_STAILQ_FOREACH( si, &op->o_bd->be_syncinfo, si_next ) {
-                                       struct berval tmpbv;
-                                       ber_dupbv( &tmpbv, &si->si_provideruri_bv[0] );
-                                       ber_bvarray_add( &deref, &tmpbv );
-                               }
-                       } else {
-                               deref = default_referral;
-                       }
-                       rs->sr_ref = referral_rewrite( deref, NULL, &op->o_req_dn,
-                               LDAP_SCOPE_DEFAULT );
+                       rs->sr_ref = referral_rewrite( default_referral, NULL,
+                                       &op->o_req_dn, LDAP_SCOPE_DEFAULT );
                }
 
                rs->sr_err = LDAP_REFERRAL;
-               send_ldap_result( op, rs );
-
-               if ( rs->sr_ref != default_referral ) {
-                       ber_bvarray_free( rs->sr_ref );
-               }
-               free( (char *)rs->sr_matched );
-               rs->sr_ref = NULL;
-               rs->sr_matched = NULL;
-
-               rs->sr_err = -1;
-               goto done;
+               rs->sr_flags = REP_MATCHED_MUSTBEFREED | REP_REF_MUSTBEFREED;
+               goto return_results;
        }
 
-       bdb_cache_find_id( op, ltid, eip->bei_id, &eip, 0, locker, &plock );
+       rc = bdb_cache_find_id( op, ltid, eip->bei_id, &eip, 0, locker, &plock );
+       switch( rc ) {
+       case DB_LOCK_DEADLOCK:
+       case DB_LOCK_NOTGRANTED:
+               goto retry;
+       case 0:
+       case DB_NOTFOUND:
+               break;
+       default:
+               rs->sr_err = LDAP_OTHER;
+               rs->sr_text = "internal error";
+               goto return_results;
+       }
        if ( eip ) p = eip->bei_e;
 
        if ( pdn.bv_len != 0 ) {
                if( p == NULL || !bvmatch( &pdn, &p->e_nname )) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG ( OPERATION, DETAIL1, 
-                               "<=- bdb_delete: parent does not exist\n", 0, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_TRACE,
-                               "<=- bdb_delete: parent does not exist\n",
-                               0, 0, 0);
-#endif
+                               "<=- " LDAP_XSTRING(bdb_delete) ": parent "
+                               "does not exist\n", 0, 0, 0 );
                        rs->sr_err = LDAP_OTHER;
                        rs->sr_text = "could not locate parent of entry";
                        goto return_results;
@@ -217,10 +203,7 @@ retry:     /* transaction retry */
 
                /* check parent for "children" acl */
                rs->sr_err = access_allowed( op, p,
-                       children, NULL, ACL_WRITE, NULL );
-
-               bdb_unlocked_cache_return_entry_r(&bdb->bi_cache, p);
-               p = NULL;
+                       children, NULL, ACL_WDEL, NULL );
 
                if ( !rs->sr_err  ) {
                        switch( opinfo.boi_err ) {
@@ -229,14 +212,9 @@ retry:     /* transaction retry */
                                goto retry;
                        }
 
-#ifdef NEW_LOGGING
-                       LDAP_LOG ( OPERATION, DETAIL1, 
-                               "<=- bdb_delete: no write access to parent\n", 0, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_TRACE,
-                               "<=- bdb_delete: no write access to parent\n",
-                               0, 0, 0 );
-#endif
+                               "<=- " LDAP_XSTRING(bdb_delete) ": no write "
+                               "access to parent\n", 0, 0, 0 );
                        rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
                        rs->sr_text = "no write access to parent";
                        goto return_results;
@@ -251,7 +229,7 @@ retry:      /* transaction retry */
 
                                /* check parent for "children" acl */
                                rs->sr_err = access_allowed( op, p,
-                                       children, NULL, ACL_WRITE, NULL );
+                                       children, NULL, ACL_WDEL, NULL );
 
                                p = NULL;
 
@@ -262,28 +240,19 @@ retry:    /* transaction retry */
                                                goto retry;
                                        }
 
-#ifdef NEW_LOGGING
-                                       LDAP_LOG ( OPERATION, DETAIL1, 
-                                               "<=- bdb_delete: no access to parent\n", 0, 0, 0 );
-#else
                                        Debug( LDAP_DEBUG_TRACE,
-                                               "<=- bdb_delete: no access "
-                                               "to parent\n", 0, 0, 0 );
-#endif
+                                               "<=- " LDAP_XSTRING(bdb_delete)
+                                               ": no access to parent\n",
+                                               0, 0, 0 );
                                        rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
                                        rs->sr_text = "no write access to parent";
                                        goto return_results;
                                }
 
                        } else {
-#ifdef NEW_LOGGING
-                               LDAP_LOG ( OPERATION, DETAIL1, 
-                                       "<=- bdb_delete: no parent and not root\n", 0, 0, 0 );
-#else
                                Debug( LDAP_DEBUG_TRACE,
-                                       "<=- bdb_delete: no parent "
-                                       "and not root\n", 0, 0, 0);
-#endif
+                                       "<=- " LDAP_XSTRING(bdb_delete)
+                                       ": no parent and not root\n", 0, 0, 0 );
                                rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
                                goto return_results;
                        }
@@ -298,7 +267,7 @@ retry:      /* transaction retry */
        }
 
        rs->sr_err = access_allowed( op, e,
-               entry, NULL, ACL_WRITE, NULL );
+               entry, NULL, ACL_WDEL, NULL );
 
        if ( !rs->sr_err  ) {
                switch( opinfo.boi_err ) {
@@ -307,14 +276,9 @@ retry:     /* transaction retry */
                        goto retry;
                }
 
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, DETAIL1, 
-                       "<=- bdb_delete: no write access to entry\n", 0, 0, 0 );
-#else
                Debug( LDAP_DEBUG_TRACE,
-                       "<=- bdb_delete: no write access to entry\n",
-                       0, 0, 0 );
-#endif
+                       "<=- " LDAP_XSTRING(bdb_delete) ": no write access "
+                       "to entry\n", 0, 0, 0 );
                rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
                rs->sr_text = "no write access to entry";
                goto return_results;
@@ -324,41 +288,30 @@ retry:    /* transaction retry */
                /* entry is a referral, don't allow delete */
                rs->sr_ref = get_entry_referrals( op, e );
 
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, DETAIL1, 
-                       "<=- bdb_delete: entry is referral\n", 0, 0, 0 );
-#else
                Debug( LDAP_DEBUG_TRACE,
-                       "bdb_delete: entry is referral\n", 0, 0, 0 );
-#endif
+                       LDAP_XSTRING(bdb_delete) ": entry is referral\n",
+                       0, 0, 0 );
 
                rs->sr_err = LDAP_REFERRAL;
-               rs->sr_matched = e->e_name.bv_val;
-               send_ldap_result( op, rs );
-
-               ber_bvarray_free( rs->sr_ref );
-               rs->sr_ref = NULL;
-               rs->sr_matched = NULL;
-
-               rs->sr_err = 1;
-               goto done;
+               rs->sr_matched = ch_strdup( e->e_name.bv_val );
+               rs->sr_flags = REP_MATCHED_MUSTBEFREED | REP_REF_MUSTBEFREED;
+               goto return_results;
        }
 
        /* pre-read */
        if( op->o_preread ) {
+               if( preread_ctrl == NULL ) {
+                       preread_ctrl = &ctrls[num_ctrls++];
+                       ctrls[num_ctrls] = NULL;
+               }
                if( slap_read_controls( op, rs, e,
-                       &slap_pre_read_bv, &ctrls[num_ctrls] ) )
+                       &slap_pre_read_bv, preread_ctrl ) )
                {
-#ifdef NEW_LOGGING
-                       LDAP_LOG ( OPERATION, DETAIL1, 
-                               "<=- bdb_delete: pre-read failed!\n", 0, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_TRACE,
-                               "<=- bdb_delete: pre-read failed!\n", 0, 0, 0 );
-#endif
+                               "<=- " LDAP_XSTRING(bdb_delete) ": pre-read "
+                               "failed!\n", 0, 0, 0 );
                        goto return_results;
                }
-               ctrls[++num_ctrls] = NULL;
        }
 
        /* nested transaction */
@@ -366,14 +319,9 @@ retry:     /* transaction retry */
                bdb->bi_db_opflags );
        rs->sr_text = NULL;
        if( rs->sr_err != 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, ERR, 
-                       "bdb_delete: txn_begin(2) failed: %s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
-#else
                Debug( LDAP_DEBUG_TRACE,
-                       "bdb_delete: txn_begin(2) failed: %s (%d)\n",
-                       db_strerror(rs->sr_err), rs->sr_err, 0 );
-#endif
+                       LDAP_XSTRING(bdb_delete) ": txn_begin(2) failed: "
+                       "%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
                rs->sr_err = LDAP_OTHER;
                rs->sr_text = "internal error";
                goto return_results;
@@ -387,27 +335,18 @@ retry:    /* transaction retry */
                case DB_LOCK_NOTGRANTED:
                        goto retry;
                case 0:
-#ifdef NEW_LOGGING
-                       LDAP_LOG ( OPERATION, DETAIL1, 
-                               "<=- bdb_delete: non-leaf %s\n", op->o_req_dn.bv_val, 0, 0 );
-#else
                        Debug(LDAP_DEBUG_ARGS,
-                               "<=- bdb_delete: non-leaf %s\n",
+                               "<=- " LDAP_XSTRING(bdb_delete)
+                               ": non-leaf %s\n",
                                op->o_req_dn.bv_val, 0, 0);
-#endif
                        rs->sr_err = LDAP_NOT_ALLOWED_ON_NONLEAF;
-                       rs->sr_text = "subtree delete not supported";
+                       rs->sr_text = "subordinate objects must be deleted first";
                        break;
                default:
-#ifdef NEW_LOGGING
-                       LDAP_LOG ( OPERATION, ERR, 
-                               "<=- bdb_delete: has_children failed %s (%d)\n",
-                               db_strerror(rs->sr_err), rs->sr_err, 0 );
-#else
                        Debug(LDAP_DEBUG_ARGS,
-                               "<=- bdb_delete: has_children failed: %s (%d)\n",
+                               "<=- " LDAP_XSTRING(bdb_delete)
+                               ": has_children failed: %s (%d)\n",
                                db_strerror(rs->sr_err), rs->sr_err, 0 );
-#endif
                        rs->sr_err = LDAP_OTHER;
                        rs->sr_text = "internal error";
                }
@@ -417,15 +356,9 @@ retry:     /* transaction retry */
        /* delete from dn2id */
        rs->sr_err = bdb_dn2id_delete( op, lt2, eip, e );
        if ( rs->sr_err != 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, ERR, 
-                       "<=- bdb_delete: dn2id failed: %s (%d)\n",
-                       db_strerror(rs->sr_err), rs->sr_err, 0 );
-#else
                Debug(LDAP_DEBUG_TRACE,
-                       "<=- bdb_delete: dn2id failed: %s (%d)\n",
-                       db_strerror(rs->sr_err), rs->sr_err, 0 );
-#endif
+                       "<=- " LDAP_XSTRING(bdb_delete) ": dn2id failed: "
+                       "%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
                switch( rs->sr_err ) {
                case DB_LOCK_DEADLOCK:
                case DB_LOCK_NOTGRANTED:
@@ -436,52 +369,59 @@ retry:    /* transaction retry */
                goto return_results;
        }
 
-       /* delete from id2entry */
-       rs->sr_err = bdb_id2entry_delete( op->o_bd, lt2, e );
-       if ( rs->sr_err != 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, ERR, 
-                       "<=- bdb_delete: id2entry failed: %s (%d)\n", 
-                       db_strerror(rs->sr_err), rs->sr_err, 0 );
-#else
+       /* delete indices for old attributes */
+       rs->sr_err = bdb_index_entry_del( op, lt2, e );
+       if ( rs->sr_err != LDAP_SUCCESS ) {
                Debug(LDAP_DEBUG_TRACE,
-                       "<=- bdb_delete: id2entry failed: %s (%d)\n",
-                       db_strerror(rs->sr_err), rs->sr_err, 0 );
-#endif
+                       "<=- " LDAP_XSTRING(bdb_delete) ": index failed: "
+                       "%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
                switch( rs->sr_err ) {
                case DB_LOCK_DEADLOCK:
                case DB_LOCK_NOTGRANTED:
                        goto retry;
                }
-               rs->sr_text = "entry delete failed";
+               rs->sr_text = "entry index delete failed";
                rs->sr_err = LDAP_OTHER;
                goto return_results;
        }
 
-       /* delete indices for old attributes */
-       rs->sr_err = bdb_index_entry_del( op, lt2, e );
+       /* fixup delete CSN */
+       if ( !SLAP_SHADOW( op->o_bd )) {
+               struct berval vals[2];
+
+               assert( !BER_BVISNULL( &op->o_csn ) );
+               vals[0] = op->o_csn;
+               BER_BVZERO( &vals[1] );
+               rs->sr_err = bdb_index_values( op, lt2, slap_schema.si_ad_entryCSN,
+                       vals, 0, SLAP_INDEX_ADD_OP );
        if ( rs->sr_err != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, ERR, 
-                       "<=- bdb_delete: index failed: %s (%d)\n", 
-                       db_strerror(rs->sr_err), rs->sr_err, 0 );
-#else
+                       switch( rs->sr_err ) {
+                       case DB_LOCK_DEADLOCK:
+                       case DB_LOCK_NOTGRANTED:
+                               goto retry;
+                       }
+                       rs->sr_text = "entryCSN index update failed";
+                       rs->sr_err = LDAP_OTHER;
+                       goto return_results;
+               }
+       }
+
+       /* delete from id2entry */
+       rs->sr_err = bdb_id2entry_delete( op->o_bd, lt2, e );
+       if ( rs->sr_err != 0 ) {
                Debug( LDAP_DEBUG_TRACE,
-                       "<=- bdb_delete: index failed: %s (%d)\n", 
-                       db_strerror(rs->sr_err), rs->sr_err, 0 );
-#endif
+                       "<=- " LDAP_XSTRING(bdb_delete) ": id2entry failed: "
+                       "%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
                switch( rs->sr_err ) {
                case DB_LOCK_DEADLOCK:
                case DB_LOCK_NOTGRANTED:
                        goto retry;
                }
-               rs->sr_text = "entry index delete failed";
+               rs->sr_text = "entry delete failed";
                rs->sr_err = LDAP_OTHER;
                goto return_results;
        }
 
-       bdb_cache_find_id( op, lt2, eip->bei_id, &eip, 0, locker, &plock );
-       if ( eip ) p = eip->bei_e;
        if ( pdn.bv_len != 0 ) {
                parent_is_glue = is_entry_glue(p);
                rs->sr_err = bdb_cache_children( op, lt2, p );
@@ -493,15 +433,10 @@ retry:    /* transaction retry */
                        case 0:
                                break;
                        default:
-#ifdef NEW_LOGGING
-                               LDAP_LOG ( OPERATION, ERR, 
-                                       "<=- bdb_delete: has_children failed %s (%d)\n",
-                                       db_strerror(rs->sr_err), rs->sr_err, 0 );
-#else
                                Debug(LDAP_DEBUG_ARGS,
-                                       "<=- bdb_delete: has_children failed: %s (%d)\n",
+                                       "<=- " LDAP_XSTRING(bdb_delete)
+                                       ": has_children 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;
@@ -518,6 +453,8 @@ retry:      /* transaction retry */
                goto return_results;
        }
 
+       eid = e->e_id;
+
 #if 0  /* Do we want to reclaim deleted IDs? */
        ldap_pvt_thread_mutex_lock( &bdb->bi_lastid_mutex );
        if ( e->e_id == bdb->bi_lastid ) {
@@ -526,22 +463,12 @@ retry:    /* transaction retry */
        ldap_pvt_thread_mutex_unlock( &bdb->bi_lastid_mutex );
 #endif
 
-       if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
-               rc = bdb_csn_commit( op, rs, ltid, ei, &suffix_ei,
-                       &ctxcsn_e, &ctxcsn_added, locker );
-               switch ( rc ) {
-               case BDB_CSN_ABORT :
-                       goto return_results;
-               case BDB_CSN_RETRY :
-                       goto retry;
-               }
-       }
-
        if( op->o_noop ) {
                if ( ( rs->sr_err = TXN_ABORT( ltid ) ) != 0 ) {
                        rs->sr_text = "txn_abort (no-op) failed";
                } else {
-                       rs->sr_err = LDAP_NO_OPERATION;
+                       rs->sr_err = LDAP_X_NO_OPERATION;
+                       ltid = NULL;
                        goto return_results;
                }
        } else {
@@ -553,78 +480,43 @@ retry:    /* transaction retry */
                        goto retry;
                }
 
-               if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
-                       if ( ctxcsn_added ) {
-                               bdb_cache_add( bdb, suffix_ei,
-                                       ctxcsn_e, (struct berval *)&slap_ldapsync_cn_bv, locker );
-                       }
-               }
-
-               if ( rs->sr_err == LDAP_SUCCESS && !op->o_no_psearch ) {
-                       ldap_pvt_thread_rdwr_wlock( &bdb->bi_pslist_rwlock );
-                       LDAP_LIST_FOREACH( ps_list, &bdb->bi_psearch_list, o_ps_link ) {
-                               bdb_psearch( op, rs, ps_list, e, LDAP_PSEARCH_BY_DELETE );
-                       }
-                       ldap_pvt_thread_rdwr_wunlock( &bdb->bi_pslist_rwlock );
-               }
-
                rs->sr_err = TXN_COMMIT( ltid, 0 );
        }
        ltid = NULL;
        op->o_private = NULL;
 
        if( rs->sr_err != 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, ERR, 
-                       "bdb_delete: txn_%s failed: %s (%d)\n",
-                       op->o_noop ? "abort (no-op)" : "commit",
-                       db_strerror(rs->sr_err), rs->sr_err );
-#else
                Debug( LDAP_DEBUG_TRACE,
-                       "bdb_delete: txn_%s failed: %s (%d)\n",
+                       LDAP_XSTRING(bdb_delete) ": txn_%s failed: %s (%d)\n",
                        op->o_noop ? "abort (no-op)" : "commit",
                        db_strerror(rs->sr_err), rs->sr_err );
-#endif
                rs->sr_err = LDAP_OTHER;
                rs->sr_text = "commit failed";
 
                goto return_results;
        }
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( OPERATION, RESULTS, 
-               "bdb_delete: deleted%s id=%08lx db=\"%s\"\n",
-               op->o_noop ? " (no-op)" : "",
-               e->e_id, e->e_dn );
-#else
        Debug( LDAP_DEBUG_TRACE,
-               "bdb_delete: deleted%s id=%08lx dn=\"%s\"\n",
+               LDAP_XSTRING(bdb_delete) ": deleted%s id=%08lx dn=\"%s\"\n",
                op->o_noop ? " (no-op)" : "",
-               e->e_id, e->e_dn );
-#endif
+               eid, op->o_req_dn.bv_val );
        rs->sr_err = LDAP_SUCCESS;
        rs->sr_text = NULL;
        if( num_ctrls ) rs->sr_ctrls = ctrls;
 
 return_results:
-       send_ldap_result( op, rs );
-
-       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 );
-       }
-
        if ( rs->sr_err == LDAP_SUCCESS && parent_is_glue && parent_is_leaf ) {
                op->o_delete_glue_parent = 1;
        }
 
-done:
+       if ( p )
+               bdb_unlocked_cache_return_entry_r(&bdb->bi_cache, p);
+
        /* free entry */
        if( e != NULL ) {
                if ( rs->sr_err == LDAP_SUCCESS ) {
                        /* Free the EntryInfo and the Entry */
-                       bdb_cache_delete_cleanup( &bdb->bi_cache, e );
+                       bdb_cache_delete_cleanup( &bdb->bi_cache, BEI(e) );
                } else {
                        bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
                }
@@ -632,8 +524,22 @@ done:
 
        if( ltid != NULL ) {
                TXN_ABORT( ltid );
-               op->o_private = NULL;
        }
+       op->o_private = NULL;
+
+       send_ldap_result( op, rs );
+       if ( !SLAP_SHADOW( op->o_bd ))
+               slap_graduate_commit_csn( op );
 
+       if( preread_ctrl != NULL ) {
+               slap_sl_free( (*preread_ctrl)->ldctl_value.bv_val, op->o_tmpmemctx );
+               slap_sl_free( *preread_ctrl, op->o_tmpmemctx );
+       }
+
+       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 );
+       }
        return rs->sr_err;
 }