From: Alain Spineux <alain@baculasystems.com>
Date: Thu, 30 Jul 2020 12:33:10 +0000 (+0200)
Subject: Do not call mac_cleanup() twice when an error is raised
X-Git-Tag: Release-11.3.2~1353
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df448fb67bf1ef46dc589ce1083701994c41bd6e;p=thirdparty%2Fbacula.git

Do not call mac_cleanup() twice when an error is raised

- mac_cleanup() was called twice when an error was raised in do_mac()
---

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index 2193173eba..256be310ce 100644
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -490,10 +490,10 @@ static void *job_thread(void *arg)
       break;
    case JT_COPY:
    case JT_MIGRATE:
-      if (!job_canceled(jcr) && do_mac(jcr)) {
-         do_autoprune(jcr);
-      } else {
+      if (job_canceled(jcr)) {
          mac_cleanup(jcr, JS_ErrorTerminated, JS_ErrorTerminated);
+      } else  if (do_mac(jcr)) {
+         do_autoprune(jcr);
       }
       break;
    default: