git.sur5r.net Git - bacula/bacula/blob - bacula/patches/2.0.1-restart.patch

   1
   2  This patch should fix the Job restart on error bug that promotes
   3  an Incremental backup to a Full backup.
   4
   5  Apply it to version 2.0.1 (perhaps to 2.0.0) with:
   6
   7   cd <bacula-source>
   8   patch -p0 <2.0.1-restart.patch
   9   make
  10   ...
  11   make install
  12
  13 Index: src/dird/job.c
  14 ===================================================================
  15 RCS file: /cvsroot/bacula/bacula/src/dird/job.c,v
  16 retrieving revision 1.148.2.2
  17 diff -u -r1.148.2.2 job.c
  18 --- src/dird/job.c      12 Jan 2007 09:58:04 -0000      1.148.2.2
  19 +++ src/dird/job.c      17 Jan 2007 15:29:25 -0000
  20 @@ -852,11 +852,6 @@
  21        free_pool_memory(jcr->fname);
  22        jcr->fname = NULL;
  23     }
  24 -   if (jcr->stime) {
  25 -      Dmsg0(200, "Free JCR stime\n");
  26 -      free_pool_memory(jcr->stime);
  27 -      jcr->stime = NULL;
  28 -   }
  29     if (jcr->RestoreBootstrap) {
  30        free(jcr->RestoreBootstrap);
  31        jcr->RestoreBootstrap = NULL;
  32 @@ -889,6 +884,11 @@
  33        pthread_cond_destroy(&jcr->term_wait);
  34        jcr->term_wait_inited = false;
  35     }
  36 +   if (jcr->stime) {
  37 +      Dmsg0(200, "Free JCR stime\n");
  38 +      free_pool_memory(jcr->stime);
  39 +      jcr->stime = NULL;
  40 +   }
  41     if (jcr->fname) {
  42        Dmsg0(200, "Free JCR fname\n");
  43        free_pool_memory(jcr->fname);