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

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

diff --git a/servers/slapd/back-mdb/delete.c b/servers/slapd/back-mdb/delete.c
index eb9bd2dd720c156c92b0b7b5ffcf6b3041a49412..1735fee799c35d4d34e10aca6bda02c1fa3fb947 100644 (file)
--- a/servers/slapd/back-mdb/delete.c
+++ b/servers/slapd/back-mdb/delete.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2012 The OpenLDAP Foundation.
+ * Copyright 2000-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -124,7 +124,7 @@ txnReturn:
                goto return_results;
        }
        /* get parent */
-       rs->sr_err = mdb_dn2entry( op, txn, mc, &pdn, &p, 1 );
+       rs->sr_err = mdb_dn2entry( op, txn, mc, &pdn, &p, NULL, 1 );
        switch( rs->sr_err ) {
        case 0:
        case MDB_NOTFOUND:
@@ -167,7 +167,7 @@ txnReturn:
        }
 
        /* get entry */
-       rs->sr_err = mdb_dn2entry( op, txn, mc, &op->o_req_ndn, &e, 0 );
+       rs->sr_err = mdb_dn2entry( op, txn, mc, &op->o_req_ndn, &e, NULL, 0 );
        switch( rs->sr_err ) {
        case MDB_NOTFOUND:
                e = p;
@@ -332,7 +332,7 @@ txnReturn:
        }
 
        /* delete from dn2id */
-       rs->sr_err = mdb_dn2id_delete( op, mc, e->e_id );
+       rs->sr_err = mdb_dn2id_delete( op, mc, e->e_id, 1 );
        mdb_cursor_close( mc );
        if ( rs->sr_err != 0 ) {
                Debug(LDAP_DEBUG_TRACE,
@@ -418,7 +418,7 @@ txnReturn:
        }
 
        if( rs->sr_err != 0 ) {
-               Debug( LDAP_DEBUG_TRACE,
+               Debug( LDAP_DEBUG_ANY,
                        LDAP_XSTRING(mdb_delete) ": txn_%s failed: %s (%d)\n",
                        op->o_noop ? "abort (no-op)" : "commit",
                        mdb_strerror(rs->sr_err), rs->sr_err );