X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fadd.c;h=af22dfd18559d07a076d02841da95ecd4314441b;hb=89127c93d02d547e89e767af0736ac6d2ebab90d;hp=905a856a284efab2f60a32c09ccd7b70e7438708;hpb=2dd27b0786c511623c37a48f5935fb639cdc80dc;p=openldap

diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c
index 905a856a28..af22dfd185 100644
--- a/servers/slapd/back-bdb/add.c
+++ b/servers/slapd/back-bdb/add.c
@@ -1,7 +1,7 @@
 /* add.c - ldap BerkeleyDB back-end add routine */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -14,78 +14,116 @@
 #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;
-	char		*pdn = NULL;
-	Entry		*p = NULL;
-	int			rc; 
-	const char	*text;
+	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
+	struct berval	pdn;
+	Entry		*p;
+	EntryInfo	*ei;
 	char textbuf[SLAP_TEXT_BUFLEN];
 	size_t textlen = sizeof textbuf;
 	AttributeDescription *children = slap_schema.si_ad_children;
-	DB_TXN		*ltid = NULL;
+	AttributeDescription *entry = slap_schema.si_ad_entry;
+	DB_TXN		*ltid = NULL, *lt2;
 	struct bdb_op_info opinfo;
-
-	Debug(LDAP_DEBUG_ARGS, "==> bdb_add: %s\n", e->e_dn, 0, 0);
+#ifdef BDB_SUBENTRIES
+	int subentry;
+#endif
+	u_int32_t	locker = 0;
+	DB_LOCK		lock;
+	int		noop = 0;
+
+#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
+	Operation* ps_list;
+#endif
+
+#ifdef NEW_LOGGING
+	LDAP_LOG ( OPERATION, ARGS, "==> bdb_add: %s\n", op->oq_add.rs_e->e_name.bv_val, 0, 0 );
+#else
+	Debug(LDAP_DEBUG_ARGS, "==> bdb_add: %s\n", op->oq_add.rs_e->e_name.bv_val, 0, 0);
+#endif
 
 	/* check entry's schema */
-	rc = entry_schema_check( e, NULL, &text, textbuf, textlen );
-	if ( rc != LDAP_SUCCESS ) {
+	rs->sr_err = entry_schema_check( op->o_bd, op->oq_add.rs_e, NULL, &rs->sr_text, textbuf, textlen );
+	if ( rs->sr_err != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+	LDAP_LOG ( OPERATION, ERR, 
+		"bdb_add: entry failed schema check: %s (%d)\n", rs->sr_text, rs->sr_err, 0 );
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"bdb_add: entry failed schema check: %s (%d)\n",
-			text, rc, 0 );
+			rs->sr_text, rs->sr_err, 0 );
+#endif
 		goto return_results;
 	}
 
+#ifdef BDB_SUBENTRIES
+	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 ) {
+	rs->sr_err = bdb_next_id( op->o_bd, NULL, &op->oq_add.rs_e->e_id );
+	if( rs->sr_err != 0 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( OPERATION, ERR, 
+			"bdb_add: next_id failed (%d)\n", rs->sr_err, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"bdb_add: next_id failed (%d)\n",
-			rc, 0, 0 );
-		rc = LDAP_OTHER;
-		text = "internal error";
+			rs->sr_err, 0, 0 );
+#endif
+		rs->sr_err = LDAP_OTHER;
+		rs->sr_text = "internal error";
 		goto return_results;
 	}
 
 	if( 0 ) {
-		/* transaction retry */
-retry:	rc = txn_abort( ltid );
+retry:	/* transaction retry */
+		if( p ) {
+			/* free parent and reader lock */
+			bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p );
+			p = NULL;
+		}
+		rs->sr_err = TXN_ABORT( ltid );
 		ltid = NULL;
 		op->o_private = NULL;
-		if( rc != 0 ) {
-			rc = LDAP_OTHER;
-			text = "internal error";
+		op->o_do_not_cache = opinfo.boi_acl_cache;
+		if( rs->sr_err != 0 ) {
+			rs->sr_err = LDAP_OTHER;
+			rs->sr_text = "internal error";
 			goto return_results;
 		}
+		ldap_pvt_thread_yield();
 	}
 
 	/* begin transaction */
-	if( bdb->bi_txn ) {
-		rc = txn_begin( bdb->bi_dbenv, NULL, &ltid, 
-			bdb->bi_db_opflags );
-		text = NULL;
-		if( rc != 0 ) {
-			Debug( LDAP_DEBUG_TRACE,
-				"bdb_add: txn_begin failed: %s (%d)\n",
-				db_strerror(rc), rc, 0 );
-			rc = LDAP_OTHER;
-			text = "internal error";
-			goto return_results;
-		}
+	rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, NULL, &ltid, 
+		bdb->bi_db_opflags );
+	rs->sr_text = NULL;
+	if( rs->sr_err != 0 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( OPERATION, ERR, 
+			"bdb_add: txn_begin failed: %s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
+#else
+		Debug( LDAP_DEBUG_TRACE,
+			"bdb_add: txn_begin failed: %s (%d)\n",
+			db_strerror(rs->sr_err), rs->sr_err, 0 );
+#endif
+		rs->sr_err = LDAP_OTHER;
+		rs->sr_text = "internal error";
+		goto return_results;
 	}
 
-	opinfo.boi_bdb = be;
+	locker = TXN_ID ( ltid );
+
+	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;
 	
 	/*
@@ -93,225 +131,415 @@ retry:	rc = txn_abort( ltid );
 	 * If the parent does not exist, only allow the "root" user to
 	 * add the entry.
 	 */
-	pdn = dn_parent( be, e->e_ndn );
-
-	if( pdn != NULL && *pdn != '\0' ) {
-		Entry *matched = NULL;
-
-		/* get parent */
-		rc = bdb_dn2entry( be, ltid, pdn, &p, &matched, 0 );
-
-		switch( rc ) {
-		case 0:
-		case DB_NOTFOUND:
-			break;
-		case DB_LOCK_DEADLOCK:
-		case DB_LOCK_NOTGRANTED:
-			goto retry;
-		default:
-			rc = LDAP_OTHER;
-			text = "internal error";
-			goto return_results;
-		}
-
-		if ( p == NULL ) {
-			char *matched_dn = NULL;
-			struct berval **refs;
-
-			if ( matched != NULL ) {
-				matched_dn = ch_strdup( matched->e_dn );
-				refs = is_entry_referral( matched )
-					? get_entry_referrals( be, conn, op,
-					matched, e->e_dn, LDAP_SCOPE_DEFAULT )
-					: NULL;
-				bdb_entry_return( be, matched );
-				matched = NULL;
+	if ( be_issuffix( op->o_bd, &op->oq_add.rs_e->e_nname ) ) {
+		pdn = slap_empty_bv;
+	} else {
+		dnParent( &op->oq_add.rs_e->e_nname, &pdn );
+	}
 
-			} else {
-				refs = referral_rewrite( default_referral,
-					NULL, e->e_dn, LDAP_SCOPE_DEFAULT );
-			}
+	/* get entry or parent */
+	rs->sr_err = bdb_dn2entry( op->o_bd, ltid, &op->ora_e->e_nname, &ei,
+		1, locker, &lock, op->o_tmpmemctx );
+	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;
+	}
 
+	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;
+#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 );
+			rs->sr_err = LDAP_REFERRAL;
+			send_ldap_result( op, rs );
 
-			ber_bvecfree( refs );
-			ch_free( matched_dn );
+			ber_bvarray_free( rs->sr_ref );
+			op->o_tmpfree( (char *)rs->sr_matched, op->o_tmpmemctx );
+			rs->sr_ref = NULL;
+			rs->sr_matched = NULL;
 
 			goto done;
 		}
 
-		if ( ! access_allowed( be, conn, op, p,
-			children, NULL, ACL_WRITE ) )
-		{
+		rs->sr_err = access_allowed( op, p,
+			children, NULL, ACL_WRITE, 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 parent\n", 0, 0, 0 );
+#else
 			Debug( LDAP_DEBUG_TRACE, "bdb_add: no write access to parent\n",
 				0, 0, 0 );
-			rc = LDAP_INSUFFICIENT_ACCESS;
-			text = "no write access to parent";
+#endif
+			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",
+				0, 0, 0 );
+#endif
+			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",
 				0, 0, 0 );
-			rc = LDAP_ALIAS_PROBLEM;
-			text = "parent is an alias";
+#endif
+			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 = ch_strdup( p->e_dn );
-			struct berval **refs = is_entry_referral( p )
-				? get_entry_referrals( be, conn, op, p,
-					e->e_dn, LDAP_SCOPE_DEFAULT )
-				: NULL;
+			rs->sr_matched = p->e_name.bv_val;
+			rs->sr_ref = get_entry_referrals( 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 );
+			rs->sr_err = LDAP_REFERRAL;
+			send_ldap_result( op, rs );
 
-			ber_bvecfree( refs );
-			free( matched_dn );
+			ber_bvarray_free( rs->sr_ref );
+			bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p );
+			rs->sr_ref = NULL;
+			rs->sr_matched = NULL;
+			p = NULL;
 			goto done;
 		}
 
-		/* free parent and writer lock */
-		bdb_entry_return( be, p );
+#ifdef BDB_SUBENTRIES
+		if ( subentry ) {
+			/* FIXME: */
+			/* parent must be an administrative point of the required kind */
+		}
+#endif
+
+		/* free parent and reader lock */
+		bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p );
 		p = NULL;
 
 	} else {
 		/*
 		 * no parent!
-		 *	must be adding entry to at suffix
-		 *  or with parent ""
+		 *	must be adding entry at suffix or with parent ""
 		 */
-		if ( !be_isroot( be, &op->o_ndn )) {
-			if ( be_issuffix( be, "" ) || be_isupdate( be, &op->o_ndn ) ) {
+		if ( !be_isroot( op->o_bd, &op->o_ndn )) {
+			if ( be_issuffix( op->o_bd, (struct berval *)&slap_empty_bv )
+				|| be_isupdate( op->o_bd, &op->o_ndn ) )
+			{
 				p = (Entry *)&slap_entry_root;
 
 				/* check parent for "children" acl */
-				rc = access_allowed( be, conn, op, p,
-					children, NULL, ACL_WRITE );
+				rs->sr_err = access_allowed( op, p,
+					children, NULL, ACL_WRITE, NULL );
+
 				p = 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",
 						0, 0, 0 );
-					rc = LDAP_INSUFFICIENT_ACCESS;
-					text = "no write access to parent";
+#endif
+					rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
+					rs->sr_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 == NULL ? "suffix" : "entry at root",
+					pdn.bv_len == 0 ? "suffix" : "entry at root",
 					0, 0 );
-				rc = LDAP_INSUFFICIENT_ACCESS;
+#endif
+				rs->sr_err = 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
+			Debug( LDAP_DEBUG_TRACE,
+				"bdb_add: no parent, cannot add subentry\n",
+				0, 0, 0 );
+#endif
+			rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
+			rs->sr_text = "no parent, cannot add subentry";
+			goto return_results;;
+		}
+#endif
+	}
+
+	rs->sr_err = access_allowed( op, op->oq_add.rs_e,
+		entry, NULL, ACL_WRITE, 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",
+			0, 0, 0 );
+#endif
+		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 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( OPERATION, ERR, 
+			"bdb_add: txn_begin(2) failed: %s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
+#else
+		Debug( LDAP_DEBUG_TRACE,
+			"bdb_add: txn_begin(2) failed: %s (%d)\n",
+			db_strerror(rs->sr_err), rs->sr_err, 0 );
+#endif
+		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 ) {
+	rs->sr_err = bdb_dn2id_add( op->o_bd, lt2, ei, op->oq_add.rs_e,
+		op->o_tmpmemctx );
+	if ( rs->sr_err != 0 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( OPERATION, ERR, 
+			"bdb_add: dn2id_add failed: %s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
+#else
 		Debug( LDAP_DEBUG_TRACE, "bdb_add: dn2id_add failed: %s (%d)\n",
-			db_strerror(rc), rc, 0 );
+			db_strerror(rs->sr_err), rs->sr_err, 0 );
+#endif
 
-		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 ) {
+	rs->sr_err = bdb_id2entry_add( op->o_bd, lt2, op->oq_add.rs_e );
+	if ( rs->sr_err != 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",
 			0, 0, 0 );
-		switch( rc ) {
+#endif
+		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 ) {
+	rs->sr_err = bdb_index_entry_add( op, lt2, op->oq_add.rs_e );
+	if ( rs->sr_err != 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",
 			0, 0, 0 );
-		switch( rc ) {
+#endif
+		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;
+	}
+
+	if( op->o_noop ) {
+		if (( rs->sr_err=TXN_ABORT( ltid )) != 0 ) {
+			rs->sr_text = "txn_abort (no-op) failed";
+		} else {
+			noop = 1;
+			rs->sr_err = LDAP_SUCCESS;
+		}
+
+	} else {
+		char gid[DB_XIDDATASIZE];
 
-	if( bdb->bi_txn ) {
-		rc = txn_commit( ltid, 0 );
+		snprintf( gid, sizeof( gid ), "%s-%08lx-%08lx",
+			bdb_uuid.bv_val, (long) op->o_connid, (long) op->o_opid );
+
+		if (( rs->sr_err=TXN_PREPARE( ltid, gid )) != 0 ) {
+			rs->sr_text = "txn_prepare failed";
+
+		} else {
+			struct berval nrdn;
+
+			if (pdn.bv_len) {
+				nrdn.bv_val = op->ora_e->e_nname.bv_val;
+				nrdn.bv_len = pdn.bv_val - nrdn.bv_val - 1;
+			} else {
+				nrdn = op->ora_e->e_nname;
+			}
+
+			bdb_cache_add(bdb, ei, op->oq_add.rs_e, &nrdn, locker );
+
+			if(( rs->sr_err=TXN_COMMIT( ltid, 0 )) != 0 ) {
+				rs->sr_text = "txn_commit failed";
+			} else {
+				rs->sr_err = LDAP_SUCCESS;
+			}
+		}
 	}
+
 	ltid = NULL;
 	op->o_private = NULL;
 
-	if( rc != 0 ) {
-		Debug( LDAP_DEBUG_TRACE,
-			"bdb_add: txn_commit failed: %s (%d)\n",
-			db_strerror(rc), rc, 0 );
-		rc = LDAP_OTHER;
-		text = "commit failed";
-
-	} else {
-		Debug( LDAP_DEBUG_TRACE,
-			"bdb_add: added id=%08lx dn=\"%s\"\n",
-			e->e_id, e->e_dn, 0 );
-		rc = LDAP_SUCCESS;
-		text = NULL;
+	if (rs->sr_err == LDAP_SUCCESS) {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( OPERATION, RESULTS, 
+			"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 );
+#else
+		Debug(LDAP_DEBUG_TRACE, "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 );
+#endif
+		rs->sr_text = NULL;
+	}
+	else {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( OPERATION, ERR, 
+			"bdb_add: %s : %s (%d)\n",  rs->sr_text, db_strerror(rs->sr_err), rs->sr_err );
+#else
+		Debug( LDAP_DEBUG_TRACE, "bdb_add: %s : %s (%d)\n",
+			rs->sr_text, db_strerror(rs->sr_err), rs->sr_err );
+#endif
+		rs->sr_err = LDAP_OTHER;
 	}
 
 return_results:
-	send_ldap_result( conn, op, rc,
-		NULL, text, NULL, NULL );
+	send_ldap_result( op, rs );
 
-	if( rc == LDAP_SUCCESS && bdb->bi_txn_cp ) {
+#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
+	if ( rs->sr_err == LDAP_SUCCESS && !noop ) {
+		LDAP_LIST_FOREACH ( ps_list, &bdb->bi_psearch_list, o_ps_link ) {
+			bdb_psearch( op, rs, ps_list, op->oq_add.rs_e, LDAP_PSEARCH_BY_ADD );
+		}
+	}
+#endif /* LDAP_CLIENT_UPDATE */
+
+	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 (p != NULL) {
-		/* free parent and writer lock */
-		bdb_entry_return( be, p ); 
-	}
 
 	if( ltid != NULL ) {
-		txn_abort( ltid );
+		TXN_ABORT( ltid );
 		op->o_private = NULL;
 	}
 
-	return rc;
+	return ( ( rs->sr_err == LDAP_SUCCESS ) ? noop : rs->sr_err );
 }
+