X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fback-bdb%2Fdelete.c;h=dfa50bed0a638fdf007d94823ebc39fcef1c7399;hb=37d65aed6e108ba43e158121086df6ce0076bd85;hp=3ec651b110c0e91e28e39b3ed8687307af4f475f;hpb=ebbb6ab21679eb9611d991290c36a9d4a8f2158d;p=openldap

diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c
index 3ec651b110..dfa50bed0a 100644
--- 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-2007 The OpenLDAP Foundation.
+ * Copyright 2000-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -157,7 +157,6 @@ retry:	/* transaction retry */
 
 	opinfo.boi_bdb = op->o_bd;
 	opinfo.boi_txn = ltid;
-	opinfo.boi_locker = locker;
 	opinfo.boi_err = 0;
 	opinfo.boi_acl_cache = op->o_do_not_cache;
 	op->o_private = &opinfo;
@@ -372,7 +371,7 @@ retry:	/* transaction retry */
 		goto return_results;
 	}
 
-	LOG_PRINTF( bdb->bi_dbenv, lt2, "slapd Starting delete %s(%d)",
+	BDB_LOG_PRINTF( bdb->bi_dbenv, lt2, "slapd Starting delete %s(%d)",
 		e->e_nname.bv_val, e->e_id );
 
 	/* Can't do it if we have kids */
@@ -495,7 +494,7 @@ retry:	/* transaction retry */
 		p = NULL;
 	}
 
-	LOG_PRINTF( bdb->bi_dbenv, lt2, "slapd Commit1 delete %s(%d)",
+	BDB_LOG_PRINTF( bdb->bi_dbenv, lt2, "slapd Commit1 delete %s(%d)",
 		e->e_nname.bv_val, e->e_id );
 
 	if ( TXN_COMMIT( lt2, 0 ) != 0 ) {
@@ -524,7 +523,7 @@ retry:	/* transaction retry */
 		}
 	} else {
 
-		LOG_PRINTF( bdb->bi_dbenv, ltid, "slapd Cache delete %s(%d)",
+		BDB_LOG_PRINTF( bdb->bi_dbenv, ltid, "slapd Cache delete %s(%d)",
 			e->e_nname.bv_val, e->e_id );
 
 		rc = bdb_cache_delete( bdb, e, locker, &lock );
@@ -539,7 +538,7 @@ retry:	/* transaction retry */
 	ltid = NULL;
 	op->o_private = NULL;
 
-	LOG_PRINTF( bdb->bi_dbenv, NULL, "slapd Committed delete %s(%d)",
+	BDB_LOG_PRINTF( bdb->bi_dbenv, NULL, "slapd Committed delete %s(%d)",
 		e->e_nname.bv_val, e->e_id );
 
 	if( rs->sr_err != 0 ) {