From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 9 Dec 2004 23:11:08 +0000 (+0000)
Subject: minor cleanup
X-Git-Tag: OPENLDAP_REL_ENG_2_3_0ALPHA~68
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d3210693d2d8529ed93bc022020b0839b26e8554;p=openldap

minor cleanup
---

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 4b39224783..306b65ee69 100644
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -193,6 +193,7 @@ fe_op_add( Operation *op, SlapReply *rs )
 	Entry		*e = op->ora_e;
 	Modifications	*modlist = op->ora_modlist;
 	Modifications	**modtail = &modlist;
+	int		rc = 0;
 
 	manageDSAit = get_manageDSAit( op );
 
@@ -306,7 +307,12 @@ fe_op_add( Operation *op, SlapReply *rs )
 				cb.sc_next = op->o_callback;
 				op->o_callback = &cb;
 			}
-			if ( (op->o_bd->be_add)( op, rs ) == 0 ) {
+			rc = (op->o_bd->be_add)( op, rs );
+			if ( rc == 0 ) {
+				/* FIXME: be_entry_release_w() should be
+				 * 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;
 			}
@@ -370,7 +376,7 @@ fe_op_add( Operation *op, SlapReply *rs )
 #endif /* LDAP_SLAPI */
 
 done:;
-	return rs->sr_err;
+	return rc;
 }
 
 int