From: Eric Bollengier <eric@baculasystems.com>
Date: Wed, 6 Jul 2016 12:03:25 +0000 (+0200)
Subject: Fix #1926 about wrong duplicate job detection with Copy/Migration and Backup jobs
X-Git-Tag: Release-7.4.2~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1cc801cb3cf0bd8b20b0bd1b1987b5d193335b9b;p=bacula%2Fbacula

Fix #1926 about wrong duplicate job detection with Copy/Migration and Backup jobs
---

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index 3193741555..7558d362d7 100644
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -1011,7 +1011,9 @@ bool allow_duplicate_job(JCR *jcr)
       if (djcr->IgnoreDuplicateJobChecking) {
          continue; 
       } 
-      if (strcmp(job->name(), djcr->job->name()) == 0) {
+      if ((strcmp(job->name(), djcr->job->name()) == 0) &&
+          djcr->getJobType() == jcr->getJobType()) /* A duplicate is about the same name and the same type */
+      {
          bool cancel_dup = false;
          bool cancel_me = false;
          if (job->DuplicateJobProximity > 0) {