ldap/servers/plugins/automember/automember.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

New commits: commit 5b24c4ae8f4247b7f9c65b57855784dc73ce4151 Author: Mark Reynolds mreynolds@redhat.com Date: Wed Nov 27 10:58:43 2013 -0500

Ticket 47592 - automember plugin task memory leaks

The search pblock was not destroyed at the end of the export and rebuild tasks.

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

Reviewed by: richm(Thanks!) (cherry picked from commit 085c6d494f90231f2e572a668ab601c321bffb01)

diff --git a/ldap/servers/plugins/automember/automember.c b/ldap/servers/plugins/automember/automember.c index d63fbfe..4856681 100644 --- a/ldap/servers/plugins/automember/automember.c +++ b/ldap/servers/plugins/automember/automember.c @@ -2223,7 +2223,6 @@ void automember_rebuild_task_thread(void *arg){ } } automember_config_unlock(); - slapi_free_search_results_internal(search_pb);

out: if (plugin_is_betxn && fixup_pb) { @@ -2234,6 +2233,8 @@ out: } slapi_pblock_destroy(fixup_pb); } + slapi_free_search_results_internal(search_pb); + slapi_pblock_destroy(search_pb);

if(result){ /* error */ @@ -2433,9 +2434,11 @@ void automember_export_task_thread(void *arg){ } } automember_config_unlock(); - slapi_free_search_results_internal(search_pb);

out: + slapi_free_search_results_internal(search_pb); + slapi_pblock_destroy(search_pb); + if(ldif_fd){ PR_Close(ldif_fd); }