From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sat, 29 Dec 2007 22:17:34 +0000 (+0000)
Subject: ebl  Fixes #1028
X-Git-Tag: Release-7.0.0~5233
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=68e32afc573f0cbca61555fc47909e13c8a70a6e;p=bacula%2Fbacula

ebl  Fixes #1028


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

diff --git a/bacula/patches/2.2.7-jobdefs-migtype.patch b/bacula/patches/2.2.7-jobdefs-migtype.patch
new file mode 100644
index 0000000000..b793aaeb7b
--- /dev/null
+++ b/bacula/patches/2.2.7-jobdefs-migtype.patch
@@ -0,0 +1,56 @@
+
+ This patch permits to use migration options with JobDefs.
+ This patch fixes bug #1028.
+
+ Apply the patch to 2.2.7 (and possibly any 2.2.x version with):
+
+ cd <bacula-source>
+ patch -p0 <2.2.7-jobdefs-migtype.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+Index: src/dird/dird.c
+===================================================================
+--- src/dird/dird.c	(révision 6160)
++++ src/dird/dird.c	(copie de travail)
+@@ -58,6 +58,7 @@
+ void store_jobtype(LEX *lc, RES_ITEM *item, int index, int pass);
+ void store_level(LEX *lc, RES_ITEM *item, int index, int pass);
+ void store_replace(LEX *lc, RES_ITEM *item, int index, int pass);
++void store_migtype(LEX *lc, RES_ITEM *item, int index, int pass);
+ void init_device_resources();
+ 
+ static char *runjob = NULL;
+@@ -707,6 +708,7 @@
+                           job_items[i].handler == store_jobtype ||
+                           job_items[i].handler == store_level   ||
+                           job_items[i].handler == store_pint    ||
++                          job_items[i].handler == store_migtype ||
+                           job_items[i].handler == store_replace) {
+                   def_ivalue = (int *)((char *)(job->jobdefs) + offset);
+                   Dmsg5(400, "Job \"%s\", field \"%s\" def_ivalue=%d item %d offset=%u\n",
+Index: src/dird/dird_conf.c
+===================================================================
+--- src/dird/dird_conf.c	(révision 6160)
++++ src/dird/dird_conf.c	(copie de travail)
+@@ -74,8 +74,8 @@
+ void store_level(LEX *lc, RES_ITEM *item, int index, int pass);
+ void store_replace(LEX *lc, RES_ITEM *item, int index, int pass);
+ void store_acl(LEX *lc, RES_ITEM *item, int index, int pass);
++void store_migtype(LEX *lc, RES_ITEM *item, int index, int pass);
+ static void store_device(LEX *lc, RES_ITEM *item, int index, int pass);
+-static void store_migtype(LEX *lc, RES_ITEM *item, int index, int pass);
+ static void store_runscript(LEX *lc, RES_ITEM *item, int index, int pass);
+ static void store_runscript_when(LEX *lc, RES_ITEM *item, int index, int pass);
+ static void store_runscript_cmd(LEX *lc, RES_ITEM *item, int index, int pass);
+@@ -1559,7 +1559,7 @@
+  * Store JobType (backup, verify, restore)
+  *
+  */
+-static void store_migtype(LEX *lc, RES_ITEM *item, int index, int pass)
++void store_migtype(LEX *lc, RES_ITEM *item, int index, int pass)
+ {
+    int token, i;
+