JobDefs Storage resource completely overrode anything

  specified in Job resource -- bug 159 -- fixed.

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 8d348f2d00ca2b847d36d5b791692ec148e08c8c..429c4dcbc224e4880961911cb1c4f1d3816e5d47 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -17,6 +17,7 @@ For 1.36.1:
 - Add date/time to each Jmsg.
 
 1.37 Items:
+- Implement a Pool of type Cleaning?
 - Implement VolReadTime and VolWriteTime in SD
 - Modify Backing up Your Database to include a bootstrap file.
 - Add restore of specific JobId to regression.
@@ -980,4 +981,3 @@ Block Position: 0
 
 === Done
 - Add "Rerun failed levels = yes/no" to Job resource.
-

diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c
index 71cd29a1dc648aa89a7e842961b5193306cdfcc2..e14a156b0b93b705b4eba2dc575ceae074759c39 100644 (file)
--- a/bacula/src/dird/backup.c
+++ b/bacula/src/dird/backup.c
@@ -448,6 +448,7 @@ Backup Level:           %s%s\n\
 Client:                 %s\n\
 FileSet:                \"%s\" %s\n\
 Pool:                   \"%s\"\n\
+Storage:                \"%s\"\n\
 Start time:             %s\n\
 End time:               %s\n\
 FD Files Written:       %s\n\
@@ -472,6 +473,7 @@ Termination:            %s\n\n"),
        jcr->client->hdr.name,
        jcr->fileset->hdr.name, fsr->cCreateTime,
        jcr->pool->hdr.name,
+       jcr->store->hdr.name,
        sdt,
        edt,
        edit_uint64_with_commas(jcr->jr.JobFiles, ec1),

diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c
index dda2443f7b38b4262de3f4662549c9b5a685fce4..9f74f27d37ad1e60f7665adab6198823cb2f6444 100644 (file)
--- a/bacula/src/dird/dird.c
+++ b/bacula/src/dird/dird.c
@@ -495,7 +495,7 @@ Without that I don't know who I am :-(\n"), configfile);
         /* Handle Storage alists specifically */
         JOB *jobdefs = job->jobdefs;
         for (i=0; i < MAX_STORE; i++) {
-           if (jobdefs->storage[i]) {
+           if (jobdefs->storage[i] && !job->storage[i]) {
               STORE *st;
               job->storage[i] = New(alist(10, not_owned_by_alist));
               foreach_alist(st, jobdefs->storage[i]) {