git.sur5r.net Git - bacula/bacula/blob - bacula/patches/1.36.0/1.36.0-jobdefs.patch

   1
   2   This patch fixes JobDefs so that if a Storage resource is
   3   specified in a Job, it is not overridden by the JobDefs.
   4   Apply to 1.36.0 with:
   5
   6   cd <bacula-source>
   7   patch -p0 <1.36.0-jobdefs.patch
   8   make
   9   make install
  10   ...
  11
  12
  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
  20 @@ -448,6 +448,7 @@
  21  Client:                 %s\n\
  22  FileSet:                \"%s\" %s\n\
  23  Pool:                   \"%s\"\n\
  24 +Storage:                \"%s\"\n\
  25  Start time:             %s\n\
  26  End time:               %s\n\
  27  FD Files Written:       %s\n\
  28 @@ -472,6 +473,7 @@
  29         jcr->client->hdr.name,
  30         jcr->fileset->hdr.name, fsr->cCreateTime,
  31         jcr->pool->hdr.name,
  32 +       jcr->store->hdr.name,
  33         sdt,
  34         edt,
  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
  40 diff -u -r1.70 dird.c
  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
  43 @@ -495,7 +495,7 @@
  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]) {
  49                STORE *st;
  50                job->storage[i] = New(alist(10, not_owned_by_alist));
  51                foreach_alist(st, jobdefs->storage[i]) {