From: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed, 8 Oct 2008 14:17:23 +0000 (+0000)
Subject: ebl  Add patch file
X-Git-Tag: Release-7.0.0~4003
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bd5d745d9c36fbe81438312fa3643f023c4cc46b;p=bacula%2Fbacula

ebl  Add patch file


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7733 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/patches/2.4.2-cancel-non-running-jobs.patch b/bacula/patches/2.4.2-cancel-non-running-jobs.patch
new file mode 100644
index 0000000000..a1398dadfa
--- /dev/null
+++ b/bacula/patches/2.4.2-cancel-non-running-jobs.patch
@@ -0,0 +1,31 @@
+
+ This patch causes that jobs not yet created are now removed from
+ the work queue just after the cancel command.
+
+ It can be applied to 2.4.2 (not to previous versions) with:
+
+  cd <bacula-source>
+  patch -p0 <2.4.2-cancel-non-running-jobs.patch
+  ./configure <your-options>
+  make
+  ...
+  make install
+
+Index: src/dird/job.c
+===================================================================
+--- src/dird/job.c      (révision 7681)
++++ src/dird/job.c      (copie de travail)
+@@ -354,10 +354,11 @@
+ {
+    BSOCK *sd, *fd;
+    char ed1[50];
++   int32_t old_status = jcr->JobStatus;
+
+    set_jcr_job_status(jcr, JS_Canceled);
+
+-   switch (jcr->JobStatus) {
++   switch (old_status) {
+    case JS_Created:
+    case JS_WaitJobRes:
+    case JS_WaitClientRes:
+