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 ad6f9eba1bafa611367e045525a7d77d3fff7805..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
@@ -369,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;
        }
@@ -446,7 +467,7 @@ 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;
                }