From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sun, 30 Dec 2007 08:50:29 +0000 (+0000)
Subject: ebl  Fixes #1028 where "Selection Type" option was not usable with JobDefs.
X-Git-Tag: Release-7.0.0~5232
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fcf5176425cb842f60048de48a49d03c8b774291;p=bacula%2Fbacula

ebl  Fixes #1028 where "Selection Type" option was not usable with JobDefs.


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

diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c
index bccd480be1..fcfdb8debb 100644
--- a/bacula/src/dird/dird.c
+++ b/bacula/src/dird/dird.c
@@ -58,6 +58,7 @@ void term_job_server();
 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 @@ static bool check_resources()
                           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",
diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c
index b96bb36453..e1f2a06d80 100644
--- a/bacula/src/dird/dird_conf.c
+++ b/bacula/src/dird/dird_conf.c
@@ -74,8 +74,8 @@ 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_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 @@ static void store_device(LEX *lc, RES_ITEM *item, int index, int pass)
  * 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;
 
diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index abf7fe087d..1962e40599 100644
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -2,6 +2,7 @@
 
 General:
 29Dec07
+ebl  Fixes #1028 where "Selection Type" option was not usable with JobDefs.
 ebl  Fixes #897 and #1005 where bacula doesn't display runscript
      output in error.
 24Dec07