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 2193173eba0a26df4f8858c7c954ae2ce4c0e317..256be310cec8114e9dbdde9ca147568efdd77682 100644 (file)
--- 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: