X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fadd.c;h=8455a28bcabc1d19ad97db96c91c666aefcbec85;hb=a00f337acd425b58da7d78add1420d7bf4129b05;hp=b7c47dadb42f9f3fdd4b7d455f564b87df69e163;hpb=d7aac0a9d5520066ee987d16377eb580b2385411;p=openldap

diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c
index b7c47dadb4..8455a28bca 100644
--- a/servers/slapd/back-bdb/add.c
+++ b/servers/slapd/back-bdb/add.c
@@ -1,8 +1,17 @@
 /* add.c - ldap BerkeleyDB back-end add routine */
 /* $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-2005 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"
@@ -11,81 +20,66 @@
 #include <ac/string.h>
 
 #include "back-bdb.h"
-#include "external.h"
 
 int
-bdb_add(
-	BackendDB	*be,
-	Connection	*conn,
-	Operation	*op,
-	Entry	*e )
+bdb_add(Operation *op, SlapReply *rs )
 {
-	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
 	struct berval	pdn;
 	Entry		*p = NULL;
-	int		rc; 
-	const char	*text;
+	EntryInfo	*ei;
 	char textbuf[SLAP_TEXT_BUFLEN];
 	size_t textlen = sizeof textbuf;
 	AttributeDescription *children = slap_schema.si_ad_children;
 	AttributeDescription *entry = slap_schema.si_ad_entry;
-	DB_TXN		*ltid = NULL;
-	struct bdb_op_info opinfo;
+	DB_TXN		*ltid = NULL, *lt2;
+	struct bdb_op_info opinfo = {0};
 #ifdef BDB_SUBENTRIES
 	int subentry;
 #endif
 	u_int32_t	locker = 0;
 	DB_LOCK		lock;
-#if 0
-	u_int32_t	lockid;
-	DB_LOCK		lock;
-#endif
-	int		noop = 0;
 
-#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
-	Operation* ps_list;
-#endif
+	int		num_retries = 0;
 
-#ifdef NEW_LOGGING
-	LDAP_LOG ( OPERATION, ARGS, "==> bdb_add: %s\n", e->e_dn, 0, 0 );
-#else
-	Debug(LDAP_DEBUG_ARGS, "==> bdb_add: %s\n", e->e_dn, 0, 0);
-#endif
+	LDAPControl **postread_ctrl = NULL;
+	LDAPControl *ctrls[SLAP_MAX_RESPONSE_CONTROLS];
+	int num_ctrls = 0;
+
+	Debug(LDAP_DEBUG_ARGS, "==> " LDAP_XSTRING(bdb_add) ": %s\n",
+		op->oq_add.rs_e->e_name.bv_val, 0, 0);
+
+	ctrls[num_ctrls] = 0;
+
+	/* add opattrs to shadow as well, only missing attrs will actually
+	 * be added; helps compatibility with older OL versions */
+	slap_add_opattrs( op, &rs->sr_text, textbuf, textlen, 1 );
 
 	/* check entry's schema */
-	rc = entry_schema_check( be, e, NULL, &text, textbuf, textlen );
-	if ( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
-	LDAP_LOG ( OPERATION, ERR, 
-		"bdb_add: entry failed schema check: %s (%d)\n", text, rc, 0 );
-#else
+	rs->sr_err = entry_schema_check( op, op->oq_add.rs_e, NULL,
+		get_manageDIT(op), &rs->sr_text, textbuf, textlen );
+	if ( rs->sr_err != LDAP_SUCCESS ) {
 		Debug( LDAP_DEBUG_TRACE,
-			"bdb_add: entry failed schema check: %s (%d)\n",
-			text, rc, 0 );
-#endif
+			LDAP_XSTRING(bdb_add) ": entry failed schema check: "
+			"%s (%d)\n", rs->sr_text, rs->sr_err, 0 );
 		goto return_results;
 	}
 
 #ifdef BDB_SUBENTRIES
-	subentry = is_entry_subentry( e );
+	subentry = is_entry_subentry( op->oq_add.rs_e );
 #endif
 
 	/*
 	 * acquire an ID outside of the operation transaction
 	 * to avoid serializing adds.
 	 */
-	rc = bdb_next_id( be, NULL, &e->e_id );
-	if( rc != 0 ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG ( OPERATION, ERR, 
-			"bdb_add: next_id failed (%d)\n", rc, 0, 0 );
-#else
+	rs->sr_err = bdb_next_id( op->o_bd, NULL, &op->oq_add.rs_e->e_id );
+	if( rs->sr_err != 0 ) {
 		Debug( LDAP_DEBUG_TRACE,
-			"bdb_add: next_id failed (%d)\n",
-			rc, 0, 0 );
-#endif
-		rc = LDAP_OTHER;
-		text = "internal error";
+			LDAP_XSTRING(bdb_add) ": next_id failed (%d)\n",
+			rs->sr_err, 0, 0 );
+		rs->sr_err = LDAP_OTHER;
+		rs->sr_text = "internal error";
 		goto return_results;
 	}
 
@@ -96,42 +90,39 @@ retry:	/* transaction retry */
 			bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p );
 			p = NULL;
 		}
-		rc = TXN_ABORT( ltid );
+		rs->sr_err = TXN_ABORT( ltid );
 		ltid = NULL;
 		op->o_private = NULL;
 		op->o_do_not_cache = opinfo.boi_acl_cache;
-		if( rc != 0 ) {
-			rc = LDAP_OTHER;
-			text = "internal error";
+		if( rs->sr_err != 0 ) {
+			rs->sr_err = LDAP_OTHER;
+			rs->sr_text = "internal error";
+			goto return_results;
+		}
+		if ( op->o_abandon ) {
+			rs->sr_err = SLAPD_ABANDON;
 			goto return_results;
 		}
 		ldap_pvt_thread_yield();
+		bdb_trans_backoff( ++num_retries );
 	}
 
 	/* begin transaction */
-	rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &ltid, 
+	rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, NULL, &ltid, 
 		bdb->bi_db_opflags );
-	text = NULL;
-	if( rc != 0 ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG ( OPERATION, ERR, 
-			"bdb_add: txn_begin failed: %s (%d)\n", db_strerror(rc), rc, 0 );
-#else
+	rs->sr_text = NULL;
+	if( rs->sr_err != 0 ) {
 		Debug( LDAP_DEBUG_TRACE,
-			"bdb_add: txn_begin failed: %s (%d)\n",
-			db_strerror(rc), rc, 0 );
-#endif
-		rc = LDAP_OTHER;
-		text = "internal error";
+			LDAP_XSTRING(bdb_add) ": txn_begin failed: %s (%d)\n",
+			db_strerror(rs->sr_err), rs->sr_err, 0 );
+		rs->sr_err = LDAP_OTHER;
+		rs->sr_text = "internal error";
 		goto return_results;
 	}
 
 	locker = TXN_ID ( ltid );
-#if 0
-	lockid = TXN_ID( ltid );
-#endif
 
-	opinfo.boi_bdb = be;
+	opinfo.boi_bdb = op->o_bd;
 	opinfo.boi_txn = ltid;
 	opinfo.boi_locker = locker;
 	opinfo.boi_err = 0;
@@ -140,154 +131,106 @@ retry:	/* transaction retry */
 	
 	/*
 	 * Get the parent dn and see if the corresponding entry exists.
-	 * If the parent does not exist, only allow the "root" user to
-	 * add the entry.
 	 */
-	if ( be_issuffix( be, &e->e_nname ) ) {
+	if ( be_issuffix( op->o_bd, &op->oq_add.rs_e->e_nname ) ) {
 		pdn = slap_empty_bv;
 	} else {
-		dnParent( &e->e_nname, &pdn );
+		dnParent( &op->oq_add.rs_e->e_nname, &pdn );
 	}
 
-	if( pdn.bv_len != 0 ) {
-		Entry *matched = NULL;
-
-#if 0
-		if ( ltid ) {
-			DBT obj;
-			obj.data = pdn.bv_val-1;
-			obj.size = pdn.bv_len+1;
-			rc = LOCK_GET( bdb->bi_dbenv, lockid, 0, &obj,
-				DB_LOCK_WRITE, &lock);
-		}
-#endif
+	/* get entry or parent */
+	rs->sr_err = bdb_dn2entry( op, ltid, &op->ora_e->e_nname, &ei,
+		1, locker, &lock );
+	switch( rs->sr_err ) {
+	case 0:
+		rs->sr_err = LDAP_ALREADY_EXISTS;
+		goto return_results;
+	case DB_NOTFOUND:
+		break;
+	case DB_LOCK_DEADLOCK:
+	case DB_LOCK_NOTGRANTED:
+		goto retry;
+	case LDAP_BUSY:
+		rs->sr_text = "ldap server busy";
+		goto return_results;
+	default:
+		rs->sr_err = LDAP_OTHER;
+		rs->sr_text = "internal error";
+		goto return_results;
+	}
 
-		/* get parent */
-		rc = bdb_dn2entry_r( be, ltid, &pdn, &p, &matched, 0, locker, &lock );
+	p = ei->bei_e;
+	if ( p ) {
+		if ( !bvmatch( &pdn, &p->e_nname ) ) {
+			rs->sr_matched = ber_strdup_x( p->e_name.bv_val,
+				op->o_tmpmemctx );
+			rs->sr_ref = is_entry_referral( p )
+				? get_entry_referrals( op, p )
+				: NULL;
+			bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p );
+			p = NULL;
+			Debug( LDAP_DEBUG_TRACE,
+				LDAP_XSTRING(bdb_add) ": parent "
+				"does not exist\n", 0, 0, 0 );
 
-		switch( rc ) {
-		case 0:
-		case DB_NOTFOUND:
-			break;
-		case DB_LOCK_DEADLOCK:
-		case DB_LOCK_NOTGRANTED:
-			goto retry;
-		case LDAP_BUSY:
-			text = "ldap server busy";
+			rs->sr_err = LDAP_REFERRAL;
+			rs->sr_flags = REP_MATCHED_MUSTBEFREED | REP_REF_MUSTBEFREED;
 			goto return_results;
-		default:
-			rc = LDAP_OTHER;
-			text = "internal error";
-			goto return_results;
-		}
-
-		if ( p == NULL ) {
-			char *matched_dn = NULL;
-			BerVarray refs;
-
-			if ( matched != NULL ) {
-				matched_dn = ch_strdup( matched->e_dn );
-				refs = is_entry_referral( matched )
-					? get_entry_referrals( be, conn, op, matched )
-					: NULL;
-				bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, matched );
-				matched = NULL;
-
-			} else {
-				refs = referral_rewrite( default_referral,
-					NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
-			}
-
-#ifdef NEW_LOGGING
-			LDAP_LOG ( OPERATION, DETAIL1, 
-				"bdb_add: parent does not exist\n", 0, 0, 0 );
-#else
-			Debug( LDAP_DEBUG_TRACE, "bdb_add: parent does not exist\n",
-				0, 0, 0 );
-#endif
-
-			send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-				matched_dn, NULL, refs, NULL );
-
-			ber_bvarray_free( refs );
-			ch_free( matched_dn );
-
-			goto done;
 		}
 
-		rc = access_allowed( be, conn, op, p,
-			children, NULL, ACL_WRITE, NULL );
+		rs->sr_err = access_allowed( op, p,
+			children, NULL, ACL_WADD, NULL );
 
-		if ( ! rc ) {
+		if ( ! rs->sr_err ) {
 			switch( opinfo.boi_err ) {
 			case DB_LOCK_DEADLOCK:
 			case DB_LOCK_NOTGRANTED:
 				goto retry;
 			}
 
-#ifdef NEW_LOGGING
-			LDAP_LOG ( OPERATION, DETAIL1, 
-				"bdb_add: no write access to parent\n", 0, 0, 0 );
-#else
-			Debug( LDAP_DEBUG_TRACE, "bdb_add: no write access to parent\n",
+			Debug( LDAP_DEBUG_TRACE,
+				LDAP_XSTRING(bdb_add) ": no write access to parent\n",
 				0, 0, 0 );
-#endif
-			rc = LDAP_INSUFFICIENT_ACCESS;
-			text = "no write access to parent";
+			rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
+			rs->sr_text = "no write access to parent";
 			goto return_results;;
 		}
 
 #ifdef BDB_SUBENTRIES
 		if ( is_entry_subentry( p ) ) {
 			/* parent is a subentry, don't allow add */
-#ifdef NEW_LOGGING
-			LDAP_LOG ( OPERATION, DETAIL1, 
-				"bdb_add: parent is subentry\n", 0, 0, 0 );
-#else
-			Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is subentry\n",
+			Debug( LDAP_DEBUG_TRACE,
+				LDAP_XSTRING(bdb_add) ": parent is subentry\n",
 				0, 0, 0 );
-#endif
-			rc = LDAP_OBJECT_CLASS_VIOLATION;
-			text = "parent is a subentry";
+			rs->sr_err = LDAP_OBJECT_CLASS_VIOLATION;
+			rs->sr_text = "parent is a subentry";
 			goto return_results;;
 		}
 #endif
-#ifdef BDB_ALIASES
 		if ( is_entry_alias( p ) ) {
 			/* parent is an alias, don't allow add */
-#ifdef NEW_LOGGING
-			LDAP_LOG ( OPERATION, DETAIL1, 
-				"bdb_add: parent is alias\n", 0, 0, 0 );
-#else
-			Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is alias\n",
+			Debug( LDAP_DEBUG_TRACE,
+				LDAP_XSTRING(bdb_add) ": parent is alias\n",
 				0, 0, 0 );
-#endif
-			rc = LDAP_ALIAS_PROBLEM;
-			text = "parent is an alias";
+			rs->sr_err = LDAP_ALIAS_PROBLEM;
+			rs->sr_text = "parent is an alias";
 			goto return_results;;
 		}
-#endif
 
 		if ( is_entry_referral( p ) ) {
 			/* parent is a referral, don't allow add */
-			char *matched_dn = p->e_dn;
-			BerVarray refs = get_entry_referrals( be, conn, op, p );
-
-#ifdef NEW_LOGGING
-			LDAP_LOG ( OPERATION, DETAIL1, 
-				"bdb_add: parent is referral\n", 0, 0, 0 );
-#else
-			Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is referral\n",
-				0, 0, 0 );
-#endif
-
-			send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-				matched_dn, NULL, refs, NULL );
-
-			ber_bvarray_free( refs );
+			rs->sr_matched = ber_strdup_x( p->e_name.bv_val,
+				op->o_tmpmemctx );
+			rs->sr_ref = get_entry_referrals( op, p );
 			bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p );
 			p = NULL;
-			goto done;
+			Debug( LDAP_DEBUG_TRACE,
+				LDAP_XSTRING(bdb_add) ": parent is referral\n",
+				0, 0, 0 );
+
+			rs->sr_err = LDAP_REFERRAL;
+			rs->sr_flags = REP_MATCHED_MUSTBEFREED | REP_REF_MUSTBEFREED;
+			goto return_results;
 		}
 
 #ifdef BDB_SUBENTRIES
@@ -304,273 +247,196 @@ retry:	/* transaction retry */
 	} else {
 		/*
 		 * no parent!
-		 *	must be adding entry at suffix or with parent ""
+		 *  if not attempting to add entry at suffix or with parent ""
 		 */
-		if ( !be_isroot( be, &op->o_ndn )) {
-			if ( be_issuffix( be, (struct berval *)&slap_empty_bv )
-				|| be_isupdate( be, &op->o_ndn ) )
-			{
-				p = (Entry *)&slap_entry_root;
-
-				/* check parent for "children" acl */
-				rc = access_allowed( be, conn, op, p,
-					children, NULL, ACL_WRITE, NULL );
-
-				p = NULL;
-
-				if ( ! rc ) {
-					switch( opinfo.boi_err ) {
-					case DB_LOCK_DEADLOCK:
-					case DB_LOCK_NOTGRANTED:
-						goto retry;
-					}
-
-#ifdef NEW_LOGGING
-					LDAP_LOG ( OPERATION, DETAIL1, 
-						"bdb_add: no write access to parent\n", 0, 0, 0 );
-#else
-					Debug( LDAP_DEBUG_TRACE,
-						"bdb_add: no write access to parent\n",
-						0, 0, 0 );
-#endif
-					rc = LDAP_INSUFFICIENT_ACCESS;
-					text = "no write access to parent";
-					goto return_results;;
-				}
-
-			} else {
-#ifdef NEW_LOGGING
-				LDAP_LOG ( OPERATION, DETAIL1, "bdb_add: %s denied\n", 
-					pdn.bv_len == 0 ? "suffix" : "entry at root", 0, 0 );
-#else
-				Debug( LDAP_DEBUG_TRACE, "bdb_add: %s denied\n",
-					pdn.bv_len == 0 ? "suffix" : "entry at root",
-					0, 0 );
-#endif
-				rc = LDAP_INSUFFICIENT_ACCESS;
-				goto return_results;
-			}
-		}
-
-#ifdef BDB_SUBENTRIES
-		if( subentry ) {
-#ifdef NEW_LOGGING
-			LDAP_LOG ( OPERATION, DETAIL1, 
-				"bdb_add: no parent, cannot add subentry\n", 0, 0, 0 );
-#else
+		if ((( !be_isroot( op ) && !be_shadow_update(op) )
+			|| pdn.bv_len > 0 ) && !is_entry_glue( op->oq_add.rs_e ))
+		{
 			Debug( LDAP_DEBUG_TRACE,
-				"bdb_add: no parent, cannot add subentry\n",
-				0, 0, 0 );
-#endif
-			rc = LDAP_INSUFFICIENT_ACCESS;
-			text = "no parent, cannot add subentry";
-			goto return_results;;
-		}
-#endif
-#if 0
-		if ( ltid ) {
-			DBT obj;
-			obj.data = ",";
-			obj.size = 1;
-			rc = LOCK_GET( bdb->bi_dbenv, lockid, 0, &obj,
-				DB_LOCK_WRITE, &lock);
+				LDAP_XSTRING(bdb_add) ": %s denied\n",
+				pdn.bv_len == 0 ? "suffix" : "entry at root",
+				0, 0 );
+			rs->sr_err = LDAP_NO_SUCH_OBJECT;
+			goto return_results;
 		}
-#endif
 	}
 
-	rc = access_allowed( be, conn, op, e,
-		entry, NULL, ACL_WRITE, NULL );
+	if ( get_assert( op ) &&
+		( test_filter( op, op->oq_add.rs_e, get_assertion( op ))
+			!= LDAP_COMPARE_TRUE ))
+	{
+		rs->sr_err = LDAP_ASSERTION_FAILED;
+		goto return_results;
+	}
 
-	if ( ! rc ) {
+	rs->sr_err = access_allowed( op, op->oq_add.rs_e,
+		entry, NULL, ACL_WADD, NULL );
+
+	if ( ! rs->sr_err ) {
 		switch( opinfo.boi_err ) {
 		case DB_LOCK_DEADLOCK:
 		case DB_LOCK_NOTGRANTED:
 			goto retry;
 		}
 
-#ifdef NEW_LOGGING
-		LDAP_LOG ( OPERATION, DETAIL1, 
-			"bdb_add: no write access to entry\n", 0, 0, 0 );
-#else
-		Debug( LDAP_DEBUG_TRACE, "bdb_add: no write access to entry\n",
+		Debug( LDAP_DEBUG_TRACE,
+			LDAP_XSTRING(bdb_add) ": no write access to entry\n",
 			0, 0, 0 );
-#endif
-		rc = LDAP_INSUFFICIENT_ACCESS;
-		text = "no write access to entry";
+		rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
+		rs->sr_text = "no write access to entry";
 		goto return_results;;
 	}
 
+	/* nested transaction */
+	rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, ltid, &lt2, 
+		bdb->bi_db_opflags );
+	rs->sr_text = NULL;
+	if( rs->sr_err != 0 ) {
+		Debug( LDAP_DEBUG_TRACE,
+			LDAP_XSTRING(bdb_add) ": txn_begin(2) failed: "
+			"%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
+		rs->sr_err = LDAP_OTHER;
+		rs->sr_text = "internal error";
+		goto return_results;
+	}
+
 	/* dn2id index */
-	rc = bdb_dn2id_add( be, ltid, &pdn, e );
-	if ( rc != 0 ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG ( OPERATION, ERR, 
-			"bdb_add: dn2id_add failed: %s (%d)\n", db_strerror(rc), rc, 0 );
-#else
-		Debug( LDAP_DEBUG_TRACE, "bdb_add: dn2id_add failed: %s (%d)\n",
-			db_strerror(rc), rc, 0 );
-#endif
+	rs->sr_err = bdb_dn2id_add( op, lt2, ei, op->oq_add.rs_e );
+	if ( rs->sr_err != 0 ) {
+		Debug( LDAP_DEBUG_TRACE,
+			LDAP_XSTRING(bdb_add) ": dn2id_add failed: %s (%d)\n",
+			db_strerror(rs->sr_err), rs->sr_err, 0 );
 
-		switch( rc ) {
+		switch( rs->sr_err ) {
 		case DB_LOCK_DEADLOCK:
 		case DB_LOCK_NOTGRANTED:
 			goto retry;
 		case DB_KEYEXIST:
-			rc = LDAP_ALREADY_EXISTS;
+			rs->sr_err = LDAP_ALREADY_EXISTS;
 			break;
 		default:
-			rc = LDAP_OTHER;
+			rs->sr_err = LDAP_OTHER;
 		}
 		goto return_results;
 	}
 
 	/* id2entry index */
-	rc = bdb_id2entry_add( be, ltid, e );
-	if ( rc != 0 ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG ( OPERATION, ERR, "bdb_add: id2entry_add failed\n", 0, 0, 0 );
-#else
-		Debug( LDAP_DEBUG_TRACE, "bdb_add: id2entry_add failed\n",
+	rs->sr_err = bdb_id2entry_add( op->o_bd, lt2, op->oq_add.rs_e );
+	if ( rs->sr_err != 0 ) {
+		Debug( LDAP_DEBUG_TRACE,
+			LDAP_XSTRING(bdb_add) ": id2entry_add failed\n",
 			0, 0, 0 );
-#endif
-		switch( rc ) {
+		switch( rs->sr_err ) {
 		case DB_LOCK_DEADLOCK:
 		case DB_LOCK_NOTGRANTED:
 			goto retry;
 		default:
-			rc = LDAP_OTHER;
+			rs->sr_err = LDAP_OTHER;
 		}
-		text = "entry store failed";
+		rs->sr_text = "entry store failed";
 		goto return_results;
 	}
 
 	/* attribute indexes */
-	rc = bdb_index_entry_add( be, ltid, e, e->e_attrs );
-	if ( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG ( OPERATION, ERR, 
-			"bdb_add: index_entry_add failed\n", 0, 0, 0 );
-#else
-		Debug( LDAP_DEBUG_TRACE, "bdb_add: index_entry_add failed\n",
+	rs->sr_err = bdb_index_entry_add( op, lt2, op->oq_add.rs_e );
+	if ( rs->sr_err != LDAP_SUCCESS ) {
+		Debug( LDAP_DEBUG_TRACE,
+			LDAP_XSTRING(bdb_add) ": index_entry_add failed\n",
 			0, 0, 0 );
-#endif
-		switch( rc ) {
+		switch( rs->sr_err ) {
 		case DB_LOCK_DEADLOCK:
 		case DB_LOCK_NOTGRANTED:
 			goto retry;
 		default:
-			rc = LDAP_OTHER;
+			rs->sr_err = LDAP_OTHER;
 		}
-		text = "index generation failed";
+		rs->sr_text = "index generation failed";
+		goto return_results;
+	}
+	if ( TXN_COMMIT( lt2, 0 ) != 0 ) {
+		rs->sr_err = LDAP_OTHER;
+		rs->sr_text = "txn_commit(2) failed";
 		goto return_results;
 	}
 
+	/* post-read */
+	if( op->o_postread ) {
+		if( postread_ctrl == NULL ) {
+			postread_ctrl = &ctrls[num_ctrls++];
+			ctrls[num_ctrls] = NULL;
+		}
+		if ( slap_read_controls( op, rs, op->oq_add.rs_e,
+			&slap_post_read_bv, postread_ctrl ) )
+		{
+			Debug( LDAP_DEBUG_TRACE,
+				"<=- " LDAP_XSTRING(bdb_add) ": post-read "
+				"failed!\n", 0, 0, 0 );
+			goto return_results;
+		}
+	}
 
-	if( op->o_noop ) {
-		if (( rc=TXN_ABORT( ltid )) != 0 ) {
-			text = "txn_abort (no-op) failed";
+	if ( op->o_noop ) {
+		if (( rs->sr_err=TXN_ABORT( ltid )) != 0 ) {
+			rs->sr_text = "txn_abort (no-op) failed";
 		} else {
-			noop = 1;
-			rc = LDAP_SUCCESS;
+			rs->sr_err = LDAP_X_NO_OPERATION;
+			ltid = NULL;
+			goto return_results;
 		}
 
 	} else {
-		char gid[DB_XIDDATASIZE];
+		struct berval nrdn;
+		Entry *e = entry_dup( op->ora_e );
 
-		snprintf( gid, sizeof( gid ), "%s-%08lx-%08lx",
-			bdb_uuid.bv_val, (long) op->o_connid, (long) op->o_opid );
+		dnRdn( &e->e_nname, &nrdn );
 
-		if (( rc=TXN_PREPARE( ltid, gid )) != 0 ) {
-			text = "txn_prepare failed";
+		bdb_cache_add( bdb, ei, e, &nrdn, locker );
 
+		if(( rs->sr_err=TXN_COMMIT( ltid, 0 )) != 0 ) {
+			rs->sr_text = "txn_commit failed";
 		} else {
-			int ret = bdb_cache_add_entry_rw(bdb->bi_dbenv,
-					&bdb->bi_cache, e, CACHE_WRITE_LOCK,
-					locker, &lock);
-#if 0
-			if ( bdb_cache_add_entry_rw(&bdb->bi_cache,
-				e, CACHE_WRITE_LOCK) != 0 )
-#endif
-			switch ( ret ) {
-			case 0:
-				break;
-			case DB_LOCK_DEADLOCK:
-			case DB_LOCK_NOTGRANTED:
-				goto retry;
-			default:
-				ret = LDAP_OTHER;
-			}
-
-			if ( ret ) {
-				if(( rc=TXN_ABORT( ltid )) != 0 ) {
-					text = "cache add & txn_abort failed";
-				} else {
-					rc = LDAP_OTHER;
-					text = "cache add failed";
-				}
-			} else {
-				if(( rc=TXN_COMMIT( ltid, 0 )) != 0 ) {
-					text = "txn_commit failed";
-				} else {
-					rc = LDAP_SUCCESS;
-				}
-			}
+			rs->sr_err = LDAP_SUCCESS;
 		}
 	}
 
 	ltid = NULL;
 	op->o_private = NULL;
 
-	if (rc == LDAP_SUCCESS) {
-#ifdef NEW_LOGGING
-		LDAP_LOG ( OPERATION, RESULTS, 
-			"bdb_add: added%s id=%08lx dn=\"%s\"\n", 
-			op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn );
-#else
-		Debug(LDAP_DEBUG_TRACE, "bdb_add: added%s id=%08lx dn=\"%s\"\n",
-			op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn );
-#endif
-		text = NULL;
-		if ( !noop ) {
-			bdb_cache_entry_commit( e );
-		}
-	}
-	else {
-#ifdef NEW_LOGGING
-		LDAP_LOG ( OPERATION, ERR, 
-			"bdb_add: %s : %s (%d)\n",  text, db_strerror(rc), rc );
-#else
-		Debug( LDAP_DEBUG_TRACE, "bdb_add: %s : %s (%d)\n",
-			text, db_strerror(rc), rc );
-#endif
-		rc = LDAP_OTHER;
+	if ( rs->sr_err != LDAP_SUCCESS ) {
+		Debug( LDAP_DEBUG_TRACE,
+			LDAP_XSTRING(bdb_add) ": %s : %s (%d)\n",
+			rs->sr_text, db_strerror(rs->sr_err), rs->sr_err );
+		rs->sr_err = LDAP_OTHER;
+		goto return_results;
 	}
 
+	Debug(LDAP_DEBUG_TRACE,
+		LDAP_XSTRING(bdb_add) ": added%s id=%08lx dn=\"%s\"\n",
+		op->o_noop ? " (no-op)" : "",
+		op->oq_add.rs_e->e_id, op->oq_add.rs_e->e_dn );
+
+	rs->sr_text = NULL;
+	if( num_ctrls ) rs->sr_ctrls = ctrls;
+
 return_results:
-	send_ldap_result( conn, op, rc,
-		NULL, text, NULL, NULL );
+	send_ldap_result( op, rs );
+	if ( !SLAP_SHADOW( op->o_bd ))
+		slap_graduate_commit_csn( op );
 
-#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
-	if ( rc == LDAP_SUCCESS && !noop ) {
-		LDAP_LIST_FOREACH ( ps_list, &bdb->psearch_list, link ) {
-			bdb_psearch( be, conn, op, ps_list, e, LDAP_PSEARCH_BY_ADD );
-		}
+	if( ltid != NULL ) {
+		TXN_ABORT( ltid );
 	}
-#endif /* LDAP_CLIENT_UPDATE */
+	op->o_private = NULL;
 
-	if( rc == LDAP_SUCCESS && bdb->bi_txn_cp ) {
+	if( postread_ctrl != NULL ) {
+		slap_sl_free( (*postread_ctrl)->ldctl_value.bv_val, op->o_tmpmemctx );
+		slap_sl_free( *postread_ctrl, op->o_tmpmemctx );
+	}
+
+	if( rs->sr_err == LDAP_SUCCESS && bdb->bi_txn_cp ) {
 		ldap_pvt_thread_yield();
 		TXN_CHECKPOINT( bdb->bi_dbenv,
 			bdb->bi_txn_cp_kbyte, bdb->bi_txn_cp_min, 0 );
 	}
-
-done:
-
-	if( ltid != NULL ) {
-		TXN_ABORT( ltid );
-		op->o_private = NULL;
-	}
-
-	return ( ( rc == LDAP_SUCCESS ) ? noop : rc );
+	return rs->sr_err;
 }
-