X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fid2entry.c;h=fce1fcdc637266ec84f2a2a67ac290785be08328;hb=c59f0869ec670a8b2f58cb69a5c92202fd33f0c3;hp=492af33d7cd30016f555e4fa0421f548d60b864d;hpb=e0f0a40497b37729af6c6b5b5e8795629cbac865;p=openldap

diff --git a/servers/slapd/back-bdb/id2entry.c b/servers/slapd/back-bdb/id2entry.c
index 492af33d7c..fce1fcdc63 100644
--- a/servers/slapd/back-bdb/id2entry.c
+++ b/servers/slapd/back-bdb/id2entry.c
@@ -1,8 +1,17 @@
 /* id2entry.c - routines to deal with the id2entry database */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -160,7 +169,6 @@ int bdb_entry_return(
 		attrs_free( e->e_attrs );
 	}
 
-#ifndef BDB_HIER
 	/* See if the DNs were changed by modrdn */
 	if( e->e_nname.bv_val < e->e_bv.bv_val || e->e_nname.bv_val >
 		e->e_bv.bv_val + e->e_bv.bv_len ) {
@@ -169,17 +177,14 @@ int bdb_entry_return(
 		e->e_name.bv_val = NULL;
 		e->e_nname.bv_val = NULL;
 	}
-#else
-	/* We had to construct the dn and ndn as well, in a single block */
-	if( e->e_name.bv_val ) {
-		free( e->e_name.bv_val );
-	}
-#endif
+#ifndef BDB_HIER
 	/* In tool mode the e_bv buffer is realloc'd, leave it alone */
 	if( !(slapMode & SLAP_TOOL_MODE) ) {
 		free( e->e_bv.bv_val );
 	}
-
+#else
+	free( e->e_bv.bv_val );
+#endif
 	free( e );
 
 	return 0;
@@ -206,7 +211,7 @@ int bdb_entry_release(
 			bdb_unlocked_cache_return_entry_rw( &bdb->bi_cache, e, rw );
 		} else {
 			bdb_cache_return_entry_rw( bdb->bi_dbenv, &bdb->bi_cache, e, rw, &boi->boi_lock );
-			sl_free( boi, o->o_tmpmemctx );
+			o->o_tmpfree( boi, o->o_tmpmemctx );
 			o->o_private = NULL;
 		}
 	} else {
@@ -232,10 +237,10 @@ int bdb_entry_get(
 	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
 	struct bdb_op_info *boi = NULL;
 	DB_TXN *txn = NULL;
-	Entry *e;
+	Entry *e = NULL;
 	EntryInfo *ei;
 	int	rc;
-	const char *at_name = at->ad_cname.bv_val;
+	const char *at_name = at ? at->ad_cname.bv_val : "(null)";
 
 	u_int32_t	locker = 0;
 	DB_LOCK		lock;
@@ -276,7 +281,7 @@ int bdb_entry_get(
 
 dn2entry_retry:
 	/* can we find entry */
-	rc = bdb_dn2entry( op->o_bd, txn, ndn, &ei, 0, locker, &lock, op->o_tmpmemctx );
+	rc = bdb_dn2entry( op, txn, ndn, &ei, 0, locker, &lock );
 	switch( rc ) {
 	case DB_NOTFOUND:
 	case 0:
@@ -373,7 +378,7 @@ return_results:
 		 * release it later??
 		 */
 		if ( op && !boi ) {
-			boi = sl_calloc(1,sizeof(struct bdb_op_info),op->o_tmpmemctx);
+			boi = op->o_tmpcalloc(1,sizeof(struct bdb_op_info),op->o_tmpmemctx);
 			boi->boi_lock = lock;
 			op->o_private = boi;
 		}