Switch to openldap-data directory

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

diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c
index f09b2963b1623e20724f264275d16388e3fd3758..a469fb1265ed84f0c5fea9b7a2c3b42af47c43e2 100644 (file)
--- a/servers/slapd/back-bdb/delete.c
+++ b/servers/slapd/back-bdb/delete.c
@@ -47,7 +47,7 @@ retry:        /* transaction retry */
                }
                Debug( LDAP_DEBUG_TRACE, "==> bdb_delete: retrying...\n",
                        0, 0, 0 );
-               rc = txn_abort( ltid );
+               rc = TXN_ABORT( ltid );
                ltid = NULL;
                op->o_private = NULL;
                if( rc != 0 ) {
@@ -59,7 +59,7 @@ retry:        /* transaction retry */
        }
 
        /* begin transaction */
-       rc = txn_begin( bdb->bi_dbenv, NULL, &ltid, 
+       rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &ltid, 
                bdb->bi_db_opflags );
        text = NULL;
        if( rc != 0 ) {
@@ -233,8 +233,7 @@ retry:      /* transaction retry */
        }
 
        if ( !manageDSAit && is_entry_referral( e ) ) {
-               /* parent is a referral, don't allow add */
-               /* parent is an alias, don't allow add */
+               /* entry is a referral, don't allow delete */
                BerVarray refs = get_entry_referrals( be,
                        conn, op, e );
 
@@ -333,9 +332,9 @@ retry:      /* transaction retry */
 #endif
 
        if( op->o_noop ) {
-               rc = txn_abort( ltid );
+               rc = TXN_ABORT( ltid );
        } else {
-               rc = txn_commit( ltid, 0 );
+               rc = TXN_COMMIT( ltid, 0 );
        }
        ltid = NULL;
        op->o_private = NULL;
@@ -373,7 +372,7 @@ done:
        }
 
        if( ltid != NULL ) {
-               txn_abort( ltid );
+               TXN_ABORT( ltid );
                op->o_private = NULL;
        }