BEE Backport bacula/src/dird/admin.c

This commit is the result of the squash of the following main commits:

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Fri Nov 23 10:20:13 2018 +0100

    Fix small memory leak with Admin job

diff --git a/bacula/src/dird/admin.c b/bacula/src/dird/admin.c
index a787e9f9a64291711ffc60c2660d2eedd261f8f1..e05cb2af0d730a8536596965ab662cbb3ee93726 100644 (file)
--- a/bacula/src/dird/admin.c
+++ b/bacula/src/dird/admin.c
@@ -50,7 +50,9 @@ bool do_admin(JCR *jcr)
 
    jcr->jr.JobId = jcr->JobId;
 
-   jcr->fname = (char *)get_pool_memory(PM_FNAME);
+   if (!jcr->fname) {
+      jcr->fname = get_pool_memory(PM_FNAME);
+   }
 
    /* Print Job Start message */
    Jmsg(jcr, M_INFO, 0, _("Start Admin JobId %d, Job=%s\n"),