X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fmodify.c;h=66df842a08a2cf8ebd0dbfdfa8fb2c96e8ded43f;hb=2c94c7915a52f8df4323c8193ec424df568f0fc1;hp=d9fe477ccf00ecbcef01d1e9f4cb32f7ca5b0f99;hpb=191853eb5171a11bc477edaf347cf13355b94cea;p=openldap

diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c
index d9fe477ccf..66df842a08 100644
--- a/servers/slapd/back-bdb/modify.c
+++ b/servers/slapd/back-bdb/modify.c
@@ -1,7 +1,7 @@
 /* modify.c - bdb backend modify routine */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -33,6 +33,7 @@ int bdb_modify_internal(
 	Modification	*mod;
 	Modifications	*ml;
 	Attribute	*save_attrs;
+	Attribute 	*ap;
 
 	Debug( LDAP_DEBUG_TRACE, "bdb_modify_internal: 0x%08lx: %s\n",
 		e->e_id, e->e_dn, 0);
@@ -50,7 +51,7 @@ int bdb_modify_internal(
 		switch ( mod->sm_op ) {
 		case LDAP_MOD_ADD:
 			Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: add\n", 0, 0, 0);
-			err = add_values( e, mod, op->o_ndn );
+			err = add_values( e, mod, op->o_ndn.bv_val );
 
 			if( err != LDAP_SUCCESS ) {
 				*text = "modify: add values failed";
@@ -61,7 +62,7 @@ int bdb_modify_internal(
 
 		case LDAP_MOD_DELETE:
 			Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: delete\n", 0, 0, 0);
-			err = delete_values( e, mod, op->o_ndn );
+			err = delete_values( e, mod, op->o_ndn.bv_val );
 			assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
 			if( err != LDAP_SUCCESS ) {
 				*text = "modify: delete values failed";
@@ -72,7 +73,7 @@ int bdb_modify_internal(
 
 		case LDAP_MOD_REPLACE:
 			Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: replace\n", 0, 0, 0);
-			err = replace_values( e, mod, op->o_ndn );
+			err = replace_values( e, mod, op->o_ndn.bv_val );
 			assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
 			if( err != LDAP_SUCCESS ) {
 				*text = "modify: replace values failed";
@@ -87,7 +88,7 @@ int bdb_modify_internal(
  			 * We need to add index if necessary.
  			 */
  			mod->sm_op = LDAP_MOD_ADD;
-			err = add_values( e, mod, op->o_ndn );
+			err = add_values( e, mod, op->o_ndn.bv_val );
 
  			if ( err == LDAP_TYPE_OR_VALUE_EXISTS ) {
  				err = LDAP_SUCCESS;
@@ -115,10 +116,25 @@ int bdb_modify_internal(
 			/* unlock entry, delete from cache */
 			return err; 
 		}
+
+		/* If objectClass was modified, reset the flags */
+		if ( mod->sm_desc == slap_schema.si_ad_objectClass ) {
+			e->e_ocflags = 0;
+		}
+
+		/* check if modified attribute was indexed */
+		err = bdb_index_is_indexed( be, mod->sm_desc );
+		if ( err == LDAP_SUCCESS ) {
+			ap = attr_find( save_attrs, mod->sm_desc );
+			if ( ap ) ap->a_flags |= SLAP_ATTR_IXDEL;
+
+			ap = attr_find( e->e_attrs, mod->sm_desc );
+			if ( ap ) ap->a_flags |= SLAP_ATTR_IXADD;
+		}
 	}
 
 	/* check that the entry still obeys the schema */
-	rc = entry_schema_check( e, save_attrs, text, textbuf, textlen );
+	rc = entry_schema_check( be, e, save_attrs, text, textbuf, textlen );
 	if ( rc != LDAP_SUCCESS ) {
 		attrs_free( e->e_attrs );
 		e->e_attrs = save_attrs;
@@ -127,15 +143,41 @@ int bdb_modify_internal(
 		return rc;
 	}
 
-#if BDB_INDEX
-	/* delete indices for old attributes */
-	rc = bdb_index_entry_del( be, tid, e, save_attrs);
-
-	/* add indices for new attributes */
-	rc = bdb_index_entry_add( be, tid, e, e->e_attrs);
-#endif
+	/* update the indices of the modified attributes */
+
+	/* start with deleting the old index entries */
+	for ( ap = save_attrs; ap != NULL; ap = ap->a_next ) {
+		if ( ap->a_flags & SLAP_ATTR_IXDEL ) {
+			rc = bdb_index_values( be, tid, ap->a_desc, ap->a_vals,
+					       e->e_id, SLAP_INDEX_DELETE_OP );
+			if ( rc != LDAP_SUCCESS ) {
+				attrs_free( e->e_attrs );
+				e->e_attrs = save_attrs;
+				Debug( LDAP_DEBUG_ANY,
+				       "Attribute index delete failure",
+				       0, 0, 0 );
+				return rc;
+			}
+			ap->a_flags &= ~SLAP_ATTR_IXDEL;
+		}
+	}
 
-	attrs_free( save_attrs );
+	/* add the new index entries */
+	for ( ap = e->e_attrs; ap != NULL; ap = ap->a_next ) {
+		if (ap->a_flags & SLAP_ATTR_IXADD) {
+			rc = bdb_index_values( be, tid, ap->a_desc, ap->a_vals,
+					       e->e_id, SLAP_INDEX_ADD_OP );
+			if ( rc != LDAP_SUCCESS ) {
+				attrs_free( e->e_attrs );
+				e->e_attrs = save_attrs;
+				Debug( LDAP_DEBUG_ANY,
+				       "Attribute index add failure",
+				       0, 0, 0 );
+				return rc;
+			}
+			ap->a_flags &= ~SLAP_ATTR_IXADD;
+		}
+	}
 
 	return rc;
 }
@@ -146,8 +188,8 @@ bdb_modify(
 	BackendDB	*be,
 	Connection	*conn,
 	Operation	*op,
-	const char	*dn,
-	const char	*ndn,
+	struct berval	*dn,
+	struct berval	*ndn,
 	Modifications	*modlist )
 {
 	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
@@ -158,12 +200,12 @@ bdb_modify(
 	const char *text = NULL;
 	char textbuf[SLAP_TEXT_BUFLEN];
 	size_t textlen = sizeof textbuf;
-	DB_TXN	*ltid;
+	DB_TXN	*ltid = NULL;
 	struct bdb_op_info opinfo;
 
-	Debug( LDAP_DEBUG_ARGS, "bdb_modify: %s\n", dn, 0, 0 );
+	Debug( LDAP_DEBUG_ARGS, "bdb_modify: %s\n", dn->bv_val, 0, 0 );
 
-	if (0) {
+	if( 0 ) {
 retry:	/* transaction retry */
 		Debug(LDAP_DEBUG_TRACE,
 			"bdb_modify: retrying...\n", 0, 0, 0);
@@ -175,18 +217,22 @@ retry:	/* transaction retry */
 			text = "internal error";
 			goto return_results;
 		}
+		ldap_pvt_thread_yield();
 	}
 
-	/* begin transaction */
-	rc = txn_begin( bdb->bi_dbenv, NULL, &ltid, 0 );
-	text = NULL;
-	if( rc != 0 ) {
-		Debug( LDAP_DEBUG_TRACE,
-			"bdb_modify: txn_begin failed: %s (%d)\n",
-			db_strerror(rc), rc, 0 );
-		rc = LDAP_OTHER;
-		text = "internal error";
-		goto return_results;
+	if( bdb->bi_txn ) {
+		/* begin transaction */
+		rc = txn_begin( bdb->bi_dbenv, NULL, &ltid, 
+			bdb->bi_db_opflags );
+		text = NULL;
+		if( rc != 0 ) {
+			Debug( LDAP_DEBUG_TRACE,
+				"bdb_modify: txn_begin failed: %s (%d)\n",
+				db_strerror(rc), rc, 0 );
+			rc = LDAP_OTHER;
+			text = "internal error";
+			goto return_results;
+		}
 	}
 
 	opinfo.boi_bdb = be;
@@ -217,7 +263,7 @@ retry:	/* transaction retry */
 	/* acquire and lock entry */
 	if ( e == NULL ) {
 		char* matched_dn = NULL;
-		struct berval **refs = NULL;
+		BerVarray refs;
 
 		if ( matched != NULL ) {
 			matched_dn = ch_strdup( matched->e_dn );
@@ -228,16 +274,15 @@ retry:	/* transaction retry */
 			matched = NULL;
 
 		} else {
-			refs = default_referral;
+			refs = referral_rewrite( default_referral,
+				NULL, dn, LDAP_SCOPE_DEFAULT );
 		}
 
 		send_ldap_result( conn, op, rc = LDAP_REFERRAL,
 			matched_dn, NULL, refs, NULL );
 
-		if ( matched != NULL ) {
-			ber_bvecfree( refs );
-			free( matched_dn );
-		}
+		ber_bvarray_free( refs );
+		free( matched_dn );
 
 		return rc;
 	}
@@ -245,7 +290,7 @@ retry:	/* transaction retry */
 	if ( !manageDSAit && is_entry_referral( e ) ) {
 		/* parent is a referral, don't allow add */
 		/* parent is an alias, don't allow add */
-		struct berval **refs = get_entry_referrals( be,
+		BerVarray refs = get_entry_referrals( be,
 			conn, op, e );
 
 		Debug( LDAP_DEBUG_TRACE,
@@ -255,7 +300,7 @@ retry:	/* transaction retry */
 		send_ldap_result( conn, op, rc = LDAP_REFERRAL,
 			e->e_dn, NULL, refs, NULL );
 
-		ber_bvecfree( refs );
+		ber_bvarray_free( refs );
 		goto done;
 	}
 	
@@ -290,7 +335,9 @@ retry:	/* transaction retry */
 		goto return_results;
 	}
 
-	rc = txn_commit( ltid, 0 );
+	if( bdb->bi_txn ) {
+		rc = txn_commit( ltid, 0 );
+	}
 	ltid = NULL;
 	op->o_private = NULL;
 
@@ -300,9 +347,10 @@ retry:	/* transaction retry */
 			db_strerror(rc), rc, 0 );
 		rc = LDAP_OTHER;
 		text = "commit failed";
+
 	} else {
 		Debug( LDAP_DEBUG_TRACE,
-			"bdb_modify: updated id=%08x dn=\"%s\"\n",
+			"bdb_modify: updated id=%08lx dn=\"%s\"\n",
 			e->e_id, e->e_dn, 0 );
 		rc = LDAP_SUCCESS;
 		text = NULL;
@@ -312,9 +360,9 @@ return_results:
 	send_ldap_result( conn, op, rc,
 		NULL, text, NULL, NULL );
 
-	if(rc == LDAP_SUCCESS && bdb->bi_txn_cp ) {
+	if( rc == LDAP_SUCCESS && bdb->bi_txn_cp ) {
 		ldap_pvt_thread_yield();
-		txn_checkpoint( bdb->bi_dbenv,
+		TXN_CHECKPOINT( bdb->bi_dbenv,
 			bdb->bi_txn_cp_kbyte, bdb->bi_txn_cp_min, 0 );
 	}
 
@@ -337,55 +385,93 @@ add_values(
 	char	*dn
 )
 {
-	int		i;
+	int		i, j;
 	Attribute	*a;
 
-	/* char *desc = mod->sm_desc->ad_cname->bv_val; */
+	/* char *desc = mod->sm_desc->ad_cname.bv_val; */
 	MatchingRule *mr = mod->sm_desc->ad_type->sat_equality;
 
 	a = attr_find( e->e_attrs, mod->sm_desc );
 
 	/* check if the values we're adding already exist */
-	if ( a != NULL ) {
-		if( mr == NULL || !mr->smr_match ) {
+	if( mr == NULL || !mr->smr_match ) {
+		if ( a != NULL ) {
 			/* do not allow add of additional attribute
 				if no equality rule exists */
 			return LDAP_INAPPROPRIATE_MATCHING;
 		}
 
-		for ( i = 0; mod->sm_bvalues[i] != NULL; i++ ) {
-			int rc;
-			int j;
+		for ( i = 0; mod->sm_bvalues[i].bv_val != NULL; i++ ) {
+			/* test asserted values against existing values */
+			if( a ) {
+				for( j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
+					int rc = ber_bvcmp( &mod->sm_bvalues[i],
+						&a->a_vals[j] );
+
+					if( rc == 0 ) {
+						/* value exists already */
+						return LDAP_TYPE_OR_VALUE_EXISTS;
+					}
+				}
+			}
+
+			/* test asserted values against themselves */
+			for( j = 0; j < i; j++ ) {
+				int rc = ber_bvcmp( &mod->sm_bvalues[i],
+					&mod->sm_bvalues[j] );
+
+				if( rc == 0 ) {
+					/* value exists already */
+					return LDAP_TYPE_OR_VALUE_EXISTS;
+				}
+			}
+		}
+
+	} else {
+		for ( i = 0; mod->sm_bvalues[i].bv_val != NULL; i++ ) {
+			int rc, match;
 			const char *text = NULL;
-			struct berval *asserted;
+			struct berval asserted;
 
 			rc = value_normalize( mod->sm_desc,
 				SLAP_MR_EQUALITY,
-				mod->sm_bvalues[i],
+				&mod->sm_bvalues[i],
 				&asserted,
 				&text );
 
 			if( rc != LDAP_SUCCESS ) return rc;
 
-			for ( j = 0; a->a_vals[j] != NULL; j++ ) {
-				int match;
+			if( a ) {
+				for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
+					int rc = value_match( &match, mod->sm_desc, mr,
+						SLAP_MR_VALUE_SYNTAX_MATCH,
+						&a->a_vals[j], &asserted, &text );
+
+					if( rc == LDAP_SUCCESS && match == 0 ) {
+						free( asserted.bv_val );
+						return LDAP_TYPE_OR_VALUE_EXISTS;
+					}
+				}
+			}
+
+			for ( j = 0; j < i; j++ ) {
 				int rc = value_match( &match, mod->sm_desc, mr,
-					SLAP_MR_MODIFY_MATCHING,
-					a->a_vals[j], asserted, &text );
+					SLAP_MR_VALUE_SYNTAX_MATCH,
+					&mod->sm_bvalues[j], &asserted, &text );
 
 				if( rc == LDAP_SUCCESS && match == 0 ) {
-					ber_bvfree( asserted );
+					free( asserted.bv_val );
 					return LDAP_TYPE_OR_VALUE_EXISTS;
 				}
 			}
 
-			ber_bvfree( asserted );
+			free( asserted.bv_val );
 		}
 	}
 
 	/* no - add them */
 	if( attr_merge( e, mod->sm_desc, mod->sm_bvalues ) != 0 ) {
-		/* this should return result return of attr_merge */
+		/* this should return result of attr_merge */
 		return LDAP_OTHER;
 	}
 
@@ -401,7 +487,7 @@ delete_values(
 {
 	int		i, j, k, found;
 	Attribute	*a;
-	char *desc = mod->sm_desc->ad_cname->bv_val;
+	char *desc = mod->sm_desc->ad_cname.bv_val;
 	MatchingRule *mr = mod->sm_desc->ad_type->sat_equality;
 
 	/* delete the entire attribute */
@@ -428,26 +514,26 @@ delete_values(
 	}
 
 	/* find each value to delete */
-	for ( i = 0; mod->sm_bvalues[i] != NULL; i++ ) {
+	for ( i = 0; mod->sm_bvalues[i].bv_val != NULL; i++ ) {
 		int rc;
 		const char *text = NULL;
 
-		struct berval *asserted;
+		struct berval asserted;
 
 		rc = value_normalize( mod->sm_desc,
 			SLAP_MR_EQUALITY,
-			mod->sm_bvalues[i],
+			&mod->sm_bvalues[i],
 			&asserted,
 			&text );
 
 		if( rc != LDAP_SUCCESS ) return rc;
 
 		found = 0;
-		for ( j = 0; a->a_vals[j] != NULL; j++ ) {
+		for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
 			int match;
 			int rc = value_match( &match, mod->sm_desc, mr,
-				SLAP_MR_MODIFY_MATCHING,
-				a->a_vals[j], asserted, &text );
+				SLAP_MR_VALUE_SYNTAX_MATCH,
+				&a->a_vals[j], &asserted, &text );
 
 			if( rc == LDAP_SUCCESS && match != 0 ) {
 				continue;
@@ -457,16 +543,17 @@ delete_values(
 			found = 1;
 
 			/* delete it */
-			ber_bvfree( a->a_vals[j] );
-			for ( k = j + 1; a->a_vals[k] != NULL; k++ ) {
+			free( a->a_vals[j].bv_val );
+			for ( k = j + 1; a->a_vals[k].bv_val != NULL; k++ ) {
 				a->a_vals[k - 1] = a->a_vals[k];
 			}
-			a->a_vals[k - 1] = NULL;
+			a->a_vals[k - 1].bv_val = NULL;
+			a->a_vals[k - 1].bv_len = 0;
 
 			break;
 		}
 
-		ber_bvfree( asserted );
+		free( asserted.bv_val );
 
 		/* looked through them all w/o finding it */
 		if ( ! found ) {
@@ -478,7 +565,7 @@ delete_values(
 	}
 
 	/* if no values remain, delete the entire attribute */
-	if ( a->a_vals[0] == NULL ) {
+	if ( a->a_vals[0].bv_val == NULL ) {
 		Debug( LDAP_DEBUG_TRACE,
 			"bdb_modify_delete: removing entire attribute %s\n",
 			desc, 0, 0 );
@@ -497,16 +584,10 @@ replace_values(
 	char	*dn
 )
 {
-	int rc = attr_delete( &e->e_attrs, mod->sm_desc );
-
-	if( rc != LDAP_SUCCESS && rc != LDAP_NO_SUCH_ATTRIBUTE ) {
-		return rc;
-	}
+	(void) attr_delete( &e->e_attrs, mod->sm_desc );
 
-	if ( mod->sm_bvalues != NULL &&
-		attr_merge( e, mod->sm_desc, mod->sm_bvalues ) != 0 )
-	{
-		return LDAP_OTHER;
+	if ( mod->sm_bvalues ) {
+		return add_values( e, mod, dn );
 	}
 
 	return LDAP_SUCCESS;