Commit e3e033d9 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6310

parent eabc108a
...@@ -13,6 +13,7 @@ OpenLDAP 2.4.20 Engineering ...@@ -13,6 +13,7 @@ OpenLDAP 2.4.20 Engineering
Fixed slapd-ldap leak (ITS#6326) Fixed slapd-ldap leak (ITS#6326)
Fixed slapd-relay bind segfault (ITS#6337) Fixed slapd-relay bind segfault (ITS#6337)
Fixed slapo-memberof operational attr updates (ITS#6329) Fixed slapo-memberof operational attr updates (ITS#6329)
Fixed slapo-pcache entry dupe (ITS#6310)
Fixed slapo-syncprov deadlock (ITS#6335) Fixed slapo-syncprov deadlock (ITS#6335)
Build Environment Build Environment
Fixed slapd MAXPATHLEN handling (ITS#6342) Fixed slapd MAXPATHLEN handling (ITS#6342)
......
...@@ -836,6 +836,7 @@ merge_entry( ...@@ -836,6 +836,7 @@ merge_entry(
slap_callback cb = { NULL, slap_null_cb, NULL, NULL }; slap_callback cb = { NULL, slap_null_cb, NULL, NULL };
e = entry_dup( e );
attr = e->e_attrs; attr = e->e_attrs;
e->e_attrs = NULL; e->e_attrs = NULL;
...@@ -877,7 +878,7 @@ merge_entry( ...@@ -877,7 +878,7 @@ merge_entry(
} }
} else { } else {
if ( op->ora_e == e ) if ( op->ora_e == e )
be_entry_release_w( op, e ); entry_free( e );
rc = 1; rc = 1;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment