2 This patch fixes JobDefs so that if a Storage resource is
3 specified in a Job, it is not overridden by the JobDefs.
7 patch -p0 <1.36.0-jobdefs.patch
13 Index: src/dird/backup.c
14 ===================================================================
15 RCS file: /cvsroot/bacula/bacula/src/dird/backup.c,v
16 retrieving revision 1.73
17 diff -u -r1.73 backup.c
18 --- src/dird/backup.c 11 Nov 2004 07:55:05 -0000 1.73
19 +++ src/dird/backup.c 11 Nov 2004 17:21:19 -0000
27 FD Files Written: %s\n\
29 jcr->client->hdr.name,
30 jcr->fileset->hdr.name, fsr->cCreateTime,
32 + jcr->store->hdr.name,
35 edit_uint64_with_commas(jcr->jr.JobFiles, ec1),
36 Index: src/dird/dird.c
37 ===================================================================
38 RCS file: /cvsroot/bacula/bacula/src/dird/dird.c,v
39 retrieving revision 1.70
41 --- src/dird/dird.c 22 Sep 2004 19:51:05 -0000 1.70
42 +++ src/dird/dird.c 11 Nov 2004 17:21:19 -0000
44 /* Handle Storage alists specifically */
45 JOB *jobdefs = job->jobdefs;
46 for (i=0; i < MAX_STORE; i++) {
47 - if (jobdefs->storage[i]) {
48 + if (jobdefs->storage[i] && !job->storage[i]) {
50 job->storage[i] = New(alist(10, not_owned_by_alist));
51 foreach_alist(st, jobdefs->storage[i]) {