Branch '389-ds-base-1.2.11' - ldap/servers

[Mark Reynolds]

ldap/servers/plugins/replication/repl5_replica.c |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 17834f91f7ea6a88be34b0094b53484498142d40
Author: Mark Reynolds 
Date:   Tue Sep 22 13:58:38 2015 -0400

Ticket 48266 - do not free repl keep alive entry on error

Description:  There is no need to free the "repl keep alive" entry
                  if any stage of the "add" fails.  Otherwise we could
                  potentially run into a double free.

https://fedorahosted.org/389/ticket/48266

Reviewed by: nhosoi(Thanks!)

(cherry picked from commit e5d9b0c741af1c3ea5e8212148a3ba95ee18925b)

diff --git a/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c
index cb3fdb5..1340b80 100644
--- a/ldap/servers/plugins/replication/repl5_replica.c
+++ b/ldap/servers/plugins/replication/repl5_replica.c
@@ -451,7 +451,6 @@ replica_subentry_create(Slapi_DN *repl_root, ReplicaId rid)
                 "create replication keep alive entry %s: %s\n", slapi_entry_get_dn_const(e),
                 ldap_err2string(return_value));
         rc = -1;
-        slapi_entry_free(e); /* The entry was not consumed */
         goto done;
     }