X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fadd.c;h=d5e949b3d233eee3e65adf7467ec4695a6e7f1ce;hb=b7f0983efafb6139d45814978ec376f87c228c37;hp=c401aae548ce5a0c2851562cd5b55eb838665734;hpb=713e6beb8d0ab8e3493f482f16fe4c42ebffe1ee;p=openldap

diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c
index c401aae548..d5e949b3d2 100644
--- a/servers/slapd/back-bdb/add.c
+++ b/servers/slapd/back-bdb/add.c
@@ -30,24 +30,36 @@ bdb_add(
 	AttributeDescription *children = slap_schema.si_ad_children;
 	DB_TXN		*ltid = NULL;
 	struct bdb_op_info opinfo;
+#ifdef BDB_SUBENTRIES
 	int subentry;
+#endif
 #if 0
 	u_int32_t	lockid;
 	DB_LOCK		lock;
 #endif
 
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "add", LDAP_LEVEL_ARGS, "==> bdb_add: %s\n", e->e_dn ));
+#else
 	Debug(LDAP_DEBUG_ARGS, "==> bdb_add: %s\n", e->e_dn, 0, 0);
+#endif
 
 	/* check entry's schema */
 	rc = entry_schema_check( be, e, NULL, &text, textbuf, textlen );
 	if ( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: entry failed schema check: %s (%d)\n", text, rc ));
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"bdb_add: entry failed schema check: %s (%d)\n",
 			text, rc, 0 );
+#endif
 		goto return_results;
 	}
 
+#ifdef BDB_SUBENTRIES
 	subentry = is_entry_subentry( e );
+#endif
 
 	/*
 	 * acquire an ID outside of the operation transaction
@@ -55,17 +67,21 @@ bdb_add(
 	 */
 	rc = bdb_next_id( be, NULL, &e->e_id );
 	if( rc != 0 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: next_id failed (%d)\n", rc ));
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"bdb_add: next_id failed (%d)\n",
 			rc, 0, 0 );
+#endif
 		rc = LDAP_OTHER;
 		text = "internal error";
 		goto return_results;
 	}
 
 	if( 0 ) {
-retry:          /* transaction retry */
-                rc = txn_abort( ltid );
+retry:	/* transaction retry */
+		rc = TXN_ABORT( ltid );
 		ltid = NULL;
 		op->o_private = NULL;
 		if( rc != 0 ) {
@@ -77,22 +93,24 @@ retry:          /* transaction retry */
 	}
 
 	/* 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;
-		}
-#if 0
-		lockid = TXN_ID( ltid );
+	rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &ltid, 
+		bdb->bi_db_opflags );
+	text = NULL;
+	if( rc != 0 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: txn_begin failed: %s (%d)\n", db_strerror(rc), rc ));
+#else
+		Debug( LDAP_DEBUG_TRACE,
+			"bdb_add: txn_begin failed: %s (%d)\n",
+			db_strerror(rc), rc, 0 );
 #endif
+		rc = LDAP_OTHER;
+		text = "internal error";
+		goto return_results;
 	}
+#if 0
+	lockid = TXN_ID( ltid );
+#endif
 
 	opinfo.boi_bdb = be;
 	opinfo.boi_txn = ltid;
@@ -104,16 +122,10 @@ retry:          /* transaction retry */
 	 * If the parent does not exist, only allow the "root" user to
 	 * add the entry.
 	 */
-	if ( be_issuffix( be, e->e_nname.bv_val ) ) {
-		pdn.bv_len = 0;
-		pdn.bv_val = "";
+	if ( be_issuffix( be, &e->e_nname ) ) {
+		pdn = slap_empty_bv;
 	} else {
-		rc = dnParent( e->e_nname.bv_val, (const char **)&pdn.bv_val );
-		if ( rc != LDAP_SUCCESS ) {
-			text = "internal error";
-			goto return_results;
-		}
-		pdn.bv_len = e->e_nname.bv_len - (pdn.bv_val - e->e_nname.bv_val);
+		dnParent( &e->e_nname, &pdn );
 	}
 
 	if( pdn.bv_len != 0 ) {
@@ -162,8 +174,12 @@ retry:          /* transaction retry */
 					NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
 			}
 
+#ifdef NEW_LOGGING
+			LDAP_LOG (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: parent does not exist\n" ));
+#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 );
@@ -175,7 +191,7 @@ retry:          /* transaction retry */
 		}
 
 		rc = access_allowed( be, conn, op, p,
-			children, NULL, ACL_WRITE );
+			children, NULL, ACL_WRITE, NULL );
 
 		switch( opinfo.boi_err ) {
 		case DB_LOCK_DEADLOCK:
@@ -187,55 +203,76 @@ retry:          /* transaction retry */
 		}
 
 		if ( ! rc ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: no write access to parent\n" ));
+#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;;
 		}
 
+#ifdef BDB_SUBENTRIES
 		if ( is_entry_subentry( p ) ) {
 			/* parent is a subentry, don't allow add */
+#ifdef NEW_LOGGING
+			LDAP_LOG (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: parent is subentry\n" ));
+#else
 			Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is subentry\n",
 				0, 0, 0 );
+#endif
 			rc = LDAP_OBJECT_CLASS_VIOLATION;
 			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 (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: parent is alias\n" ));
+#else
 			Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is alias\n",
 				0, 0, 0 );
+#endif
 			rc = LDAP_ALIAS_PROBLEM;
 			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 (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: parent is referral\n" ));
+#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 );
-			bdb_cache_return_entry_r( be, p );
+			bdb_cache_return_entry_r( &bdb->bi_cache, p );
 			p = NULL;
 			goto done;
 		}
 
+#ifdef BDB_SUBENTRIES
 		if ( subentry ) {
 			/* FIXME: */
 			/* parent must be an administrative point of the required kind */
 		}
+#endif
 
 		/* free parent and reader lock */
-		bdb_cache_return_entry_r( be, p );
+		bdb_cache_return_entry_r( &bdb->bi_cache, p );
 		p = NULL;
 
 	} else {
@@ -244,12 +281,13 @@ retry:          /* transaction retry */
 		 *	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_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 );
+					children, NULL, ACL_WRITE, NULL );
 				p = NULL;
 
 				switch( opinfo.boi_err ) {
@@ -259,31 +297,45 @@ retry:          /* transaction retry */
 				}
 
 				if ( ! rc ) {
+#ifdef NEW_LOGGING
+					LDAP_LOG (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: no write access to parent\n" ));
+#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 (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: %s denied\n", pdn.bv_len == 0 ? "suffix" : "entry at root" ));
+#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 (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: no parent, cannot add subentry\n" ));
+#else
 			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;
@@ -298,8 +350,12 @@ retry:          /* transaction retry */
 	/* dn2id index */
 	rc = bdb_dn2id_add( be, ltid, &pdn, e );
 	if ( rc != 0 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: dn2id_add failed: %s (%d)\n", db_strerror(rc), rc ));
+#else
 		Debug( LDAP_DEBUG_TRACE, "bdb_add: dn2id_add failed: %s (%d)\n",
 			db_strerror(rc), rc, 0 );
+#endif
 
 		switch( rc ) {
 		case DB_LOCK_DEADLOCK:
@@ -317,8 +373,12 @@ retry:          /* transaction retry */
 	/* id2entry index */
 	rc = bdb_id2entry_add( be, ltid, e );
 	if ( rc != 0 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: id2entry_add failed\n" ));
+#else
 		Debug( LDAP_DEBUG_TRACE, "bdb_add: id2entry_add failed\n",
 			0, 0, 0 );
+#endif
 		switch( rc ) {
 		case DB_LOCK_DEADLOCK:
 		case DB_LOCK_NOTGRANTED:
@@ -333,8 +393,12 @@ retry:          /* transaction retry */
 	/* attribute indexes */
 	rc = bdb_index_entry_add( be, ltid, e, e->e_attrs );
 	if ( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: index_entry_add failed\n" ));
+#else
 		Debug( LDAP_DEBUG_TRACE, "bdb_add: index_entry_add failed\n",
 			0, 0, 0 );
+#endif
 		switch( rc ) {
 		case DB_LOCK_DEADLOCK:
 		case DB_LOCK_NOTGRANTED:
@@ -346,35 +410,64 @@ retry:          /* transaction retry */
 		goto return_results;
 	}
 
-	if( bdb->bi_txn ) {
-		rc = txn_commit( ltid, 0 );
+	if( op->o_noop ) {
+		if (( rc=TXN_ABORT( ltid )) != 0 ) {
+			text = "txn_abort (no-op) failed";
+		} else {
+			rc = LDAP_SUCCESS;
+		}
+
+	} else {
+		char gid[DB_XIDDATASIZE];
+
+		snprintf( gid, sizeof( gid ), "%s-%08lx-%08lx",
+			bdb_uuid.bv_val, (long) op->o_connid, (long) op->o_opid );
+
+		if (( rc=TXN_PREPARE( ltid, gid )) != 0 ) {
+			text = "txn_prepare failed";
+
+		} else {
+			if ( bdb_cache_add_entry_rw(&bdb->bi_cache,
+				e, CACHE_WRITE_LOCK) != 0 )
+			{
+				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;
+				}
+			}
+		}
 	}
+
 	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 {
-                /* add the entry to the entry cache */
-                /* we should add to cache only upon free of txn-abort */
-                if (bdb_cache_add_entry_rw(&bdb->bi_cache, e, CACHE_WRITE_LOCK) != 0) {
-                        text = "cache add failed";
-                        goto return_results;
-                }
- 
-		Debug( LDAP_DEBUG_TRACE,
-			"bdb_add: added id=%08lx dn=\"%s\"\n",
-			e->e_id, e->e_dn, 0 );
-		rc = LDAP_SUCCESS;
+	if (rc == LDAP_SUCCESS) {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "add", LDAP_LEVEL_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;
+		bdb_cache_entry_commit( e );
+	}
+	else {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "add", LDAP_LEVEL_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;
 	}
-
-	bdb_cache_entry_commit (e);
 
 return_results:
 	send_ldap_result( conn, op, rc,
@@ -389,7 +482,7 @@ return_results:
 done:
 
 	if( ltid != NULL ) {
-		txn_abort( ltid );
+		TXN_ABORT( ltid );
 		op->o_private = NULL;
 	}