From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 12 Apr 2005 00:20:16 +0000 (+0000)
Subject: in case of success, release the entry only after global overlays have seen it on... 
X-Git-Tag: OPENLDAP_AC_BP~925
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=50bb034d97f3ee991b291cf36df4dde6d8d6669e;p=openldap

in case of success, release the entry only after global overlays have seen it on the way back
---

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index bb5903c0de..6fb1a5ad69 100644
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -49,7 +49,6 @@ do_add( Operation *op, SlapReply *rs )
 	struct berval	dn = BER_BVNULL;
 	ber_len_t	len;
 	ber_tag_t	tag;
-	Entry		*e;
 	Modifications	*modlist = NULL;
 	Modifications	**modtail = &modlist;
 	Modifications	tmp;
@@ -77,7 +76,7 @@ do_add( Operation *op, SlapReply *rs )
 		return SLAPD_DISCONNECT;
 	}
 
-	e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+	op->ora_e = (Entry *) ch_calloc( 1, sizeof(Entry) );
 
 	rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn,
 		op->o_tmpmemctx );
@@ -88,10 +87,10 @@ do_add( Operation *op, SlapReply *rs )
 		goto done;
 	}
 
-	ber_dupbv( &e->e_name, &op->o_req_dn );
-	ber_dupbv( &e->e_nname, &op->o_req_ndn );
+	ber_dupbv( &op->ora_e->e_name, &op->o_req_dn );
+	ber_dupbv( &op->ora_e->e_nname, &op->o_req_ndn );
 
-	Debug( LDAP_DEBUG_ARGS, "do_add: dn (%s)\n", e->e_dn, 0, 0 );
+	Debug( LDAP_DEBUG_ARGS, "do_add: dn (%s)\n", op->ora_e->e_dn, 0, 0 );
 
 	/* get the attrs */
 	for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
@@ -150,15 +149,15 @@ do_add( Operation *op, SlapReply *rs )
 	}
 
 	Statslog( LDAP_DEBUG_STATS, "%s ADD dn=\"%s\"\n",
-	    op->o_log_prefix, e->e_name.bv_val, 0, 0, 0 );
+	    op->o_log_prefix, op->ora_e->e_name.bv_val, 0, 0, 0 );
 
-	if ( dn_match( &e->e_nname, &slap_empty_bv ) ) {
+	if ( dn_match( &op->ora_e->e_nname, &slap_empty_bv ) ) {
 		/* protocolError may be a more appropriate error */
 		send_ldap_error( op, rs, LDAP_ALREADY_EXISTS,
 			"root DSE already exists" );
 		goto done;
 
-	} else if ( dn_match( &e->e_nname, &frontendDB->be_schemandn ) ) {
+	} else if ( dn_match( &op->ora_e->e_nname, &frontendDB->be_schemandn ) ) {
 		send_ldap_error( op, rs, LDAP_ALREADY_EXISTS,
 			"subschema subentry already exists" );
 		goto done;
@@ -173,13 +172,16 @@ do_add( Operation *op, SlapReply *rs )
 	}
 
 	/* temporary; remove if not invoking backend function */
-	op->ora_e = e;
 	op->ora_modlist = modlist;
 
 	op->o_bd = frontendDB;
 	rc = frontendDB->be_add( op, rs );
 	if ( rc == 0 ) {
-		e = NULL;
+		if ( op->ora_e ) {
+			be_entry_release_w( op, op->ora_e );
+			op->ora_e = NULL;
+		}
+		op->ora_e = NULL;
 	}
 
 done:;
@@ -188,8 +190,8 @@ done:;
 	if ( modlist != NULL ) {
 		slap_mods_free( modlist );
 	}
-	if ( e != NULL ) {
-		entry_free( e );
+	if ( op->ora_e != NULL ) {
+		entry_free( op->ora_e );
 	}
 	op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
 	op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
@@ -201,7 +203,6 @@ int
 fe_op_add( Operation *op, SlapReply *rs )
 {
 	int		manageDSAit;
-	Entry		*e = op->ora_e;
 	Modifications	*modlist = op->ora_modlist;
 	Modifications	**modtail = &modlist;
 	int		rc = 0;
@@ -214,10 +215,10 @@ fe_op_add( Operation *op, SlapReply *rs )
 	 * appropriate one, or send a referral to our "referral server"
 	 * if we don't hold it.
 	 */
-	op->o_bd = select_backend( &e->e_nname, manageDSAit, 1 );
+	op->o_bd = select_backend( &op->ora_e->e_nname, manageDSAit, 1 );
 	if ( op->o_bd == NULL ) {
 		rs->sr_ref = referral_rewrite( default_referral,
-			NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
+			NULL, &op->ora_e->e_name, LDAP_SCOPE_DEFAULT );
 		if ( !rs->sr_ref ) rs->sr_ref = default_referral;
 		if ( rs->sr_ref ) {
 			rs->sr_err = LDAP_REFERRAL;
@@ -240,7 +241,7 @@ fe_op_add( Operation *op, SlapReply *rs )
 	/* If we've got a glued backend, check the real backend */
 	op_be = op->o_bd;
 	if ( SLAP_GLUE_INSTANCE( op->o_bd )) {
-		op->o_bd = select_backend( &e->e_nname, manageDSAit, 0 );
+		op->o_bd = select_backend( &op->ora_e->e_nname, manageDSAit, 0 );
 	}
 
 	/* check restrictions */
@@ -255,7 +256,7 @@ fe_op_add( Operation *op, SlapReply *rs )
 	}
 
 #ifdef LDAP_SLAPI
-	if ( op->o_pb ) init_add_pblock( op, &op->o_req_dn, e, manageDSAit );
+	if ( op->o_pb ) init_add_pblock( op, &op->o_req_dn, op->ora_e, manageDSAit );
 #endif /* LDAP_SLAPI */
 
 	/*
@@ -308,8 +309,8 @@ fe_op_add( Operation *op, SlapReply *rs )
 				}
 			}
 
-			rs->sr_err = slap_mods2entry( modlist, &e, repl_user, 0,
-				&rs->sr_text, textbuf, textlen );
+			rs->sr_err = slap_mods2entry( modlist, &op->ora_e,
+				repl_user, 0, &rs->sr_text, textbuf, textlen );
 			if ( rs->sr_err != LDAP_SUCCESS ) {
 				send_ldap_result( op, rs );
 				goto done;
@@ -329,7 +330,6 @@ fe_op_add( Operation *op, SlapReply *rs )
 			}
 #endif /* LDAP_SLAPI */
 
-			op->ora_e = e;
 #ifdef SLAPD_MULTIMASTER
 			if ( !repl_user )
 #endif
@@ -337,16 +337,14 @@ fe_op_add( Operation *op, SlapReply *rs )
 				cb.sc_next = op->o_callback;
 				op->o_callback = &cb;
 			}
-			rc = (op->o_bd->be_add)( op, rs );
-			if ( rc == 0 ) {
-				/* FIXME: be_entry_release_w() should be
+			rc = op->o_bd->be_add( op, rs );
+			if ( rc != 0 ) {
+				/* NOTE: be_entry_release_w() is
 				 * called by do_add(), so that global
 				 * overlays on the way back can
 				 * at least read the entry */
-				be_entry_release_w( op, e );
-				e = NULL;
+				op->ora_e = NULL;
 			}
-			op->ora_e = NULL;
 
 #ifndef SLAPD_MULTIMASTER
 		} else {
@@ -370,7 +368,7 @@ fe_op_add( Operation *op, SlapReply *rs )
 
 			if ( defref != NULL ) {
 				rs->sr_ref = referral_rewrite( defref,
-					NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
+					NULL, &op->ora_e->e_name, LDAP_SCOPE_DEFAULT );
 				if ( rs->sr_ref == NULL ) rs->sr_ref = defref;
 				rs->sr_err = LDAP_REFERRAL;
 				if (!rs->sr_ref) rs->sr_ref = default_referral;