From aae49897bb513f39718b2040136031c3b59ce6a5 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Aug 01 2013 00:22:43 +0000
Subject: Ticket #47455 - valgrind - value mem leaks, uninit mem usage


https://fedorahosted.org/389/ticket/47455
Reviewed by: lkrispenz, nhosoi (Thanks!)
Branch: master
Fix Description: Can only free import job if it is not a task.  If it is
a task, the job will be freed by the task destructor.
Platforms tested: RHEL6 x86_64
Flag Day: no
Doc impact: no
(cherry picked from commit 36a907be5accb9fccb5941683defb5b03140a1a6)

---

diff --git a/ldap/servers/slapd/back-ldbm/import.c b/ldap/servers/slapd/back-ldbm/import.c
index aa6c707..ea653e4 100644
--- a/ldap/servers/slapd/back-ldbm/import.c
+++ b/ldap/servers/slapd/back-ldbm/import.c
@@ -1558,7 +1558,9 @@ error:
     instance_set_not_busy(job->inst);
     
     import_free_job(job);
-    FREE(job);
+    if (!job->task) {
+	FREE(job);
+    }
     if (producer)
         FREE(producer);