use slab memory for proxyauthz

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

diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c
index 1c7de1e3ba00ffb9fc3c19b14a6df7c561566d48..a8d144b6312dd27544e9b22800fcab57249984ee 100644 (file)
--- a/servers/slapd/back-bdb/delete.c
+++ b/servers/slapd/back-bdb/delete.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2005 The OpenLDAP Foundation.
+ * Copyright 2000-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <ac/string.h>
 
+#include "lutil.h"
 #include "back-bdb.h"
 
 int
@@ -51,15 +52,20 @@ bdb_delete( Operation *op, SlapReply *rs )
        int     parent_is_glue = 0;
        int parent_is_leaf = 0;
 
-       struct berval ctxcsn_ndn = BER_BVNULL;
-
        ctrls[num_ctrls] = 0;
 
        Debug( LDAP_DEBUG_ARGS, "==> " LDAP_XSTRING(bdb_delete) ": %s\n",
                op->o_req_dn.bv_val, 0, 0 );
 
-       build_new_dn( &ctxcsn_ndn, &op->o_bd->be_nsuffix[0],
-                               (struct berval *)&slap_ldapsync_cn_bv, op->o_tmpmemctx );
+       /* 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 */
@@ -85,7 +91,7 @@ retry:        /* transaction retry */
                }
                if ( op->o_abandon ) {
                        rs->sr_err = SLAPD_ABANDON;
-                       goto done;
+                       goto return_results;
                }
                parent_is_glue = 0;
                parent_is_leaf = 0;
@@ -166,17 +172,8 @@ retry:     /* transaction retry */
                }
 
                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;
        }
 
        rc = bdb_cache_find_id( op, ltid, eip->bei_id, &eip, 0, locker, &plock );
@@ -296,15 +293,9 @@ retry:     /* transaction retry */
                        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 */
@@ -378,34 +369,55 @@ 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 ) {
+       /* 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,
-                       "<=- " LDAP_XSTRING(bdb_delete) ": id2entry failed: "
+                       "<=- " 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 ) {
+                       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,
-                       "<=- " LDAP_XSTRING(bdb_delete) ": index failed: "
+                       "<=- " 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;
        }
@@ -455,7 +467,8 @@ retry:      /* transaction retry */
                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 {
@@ -492,19 +505,10 @@ retry:    /* transaction retry */
        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);
 
@@ -520,14 +524,22 @@ done:
 
        if( ltid != NULL ) {
                TXN_ABORT( ltid );
-               op->o_private = NULL;
        }
+       op->o_private = NULL;
 
-       slap_sl_free( ctxcsn_ndn.bv_val, op->o_tmpmemctx );
+       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;
 }