Fix bug #1268 Full Max Run Time cancels jobs (when Max Run Time = 0).

[bacula/bacula] / bacula / src / dird / bsr.c

diff --git a/bacula/src/dird/bsr.c b/bacula/src/dird/bsr.c
index b3081a6e73205c43fea0bed318f33a8c1a5d9ec6..81e384314dda741e32720430cad63b09fa2055f4 100644 (file)
--- a/bacula/src/dird/bsr.c
+++ b/bacula/src/dird/bsr.c
@@ -152,6 +152,9 @@ void free_bsr(RBSR *bsr)
       if (bsr->VolParams) {
          free(bsr->VolParams);
       }
+      if (bsr->fileregex) {
+         free(bsr->fileregex);
+      }
       next = bsr->next;
       free(bsr);
    }
@@ -363,18 +366,6 @@ static uint32_t write_bsr(UAContext *ua, RESTORE_CTX &rx, FILE *fd)
             }
             fprintf(fd, "VolSessionId=%u\n", bsr->VolSessionId);
             fprintf(fd, "VolSessionTime=%u\n", bsr->VolSessionTime);
-//            if (bsr->VolParams[i].StartFile == bsr->VolParams[i].EndFile) {
-//               fprintf(fd, "VolFile=%u\n", bsr->VolParams[i].StartFile);
-//            } else {
-//               fprintf(fd, "VolFile=%u-%u\n", bsr->VolParams[i].StartFile,
-//                       bsr->VolParams[i].EndFile);
-//            }
-//            if (bsr->VolParams[i].StartBlock == bsr->VolParams[i].EndBlock) {
-//               fprintf(fd, "VolBlock=%u\n", bsr->VolParams[i].StartBlock);
-//            } else {
-//               fprintf(fd, "VolBlock=%u-%u\n", bsr->VolParams[i].StartBlock,
-//                       bsr->VolParams[i].EndBlock);
-//            }
             fprintf(fd, "VolAddr=%s-%s\n", edit_uint64(bsr->VolParams[i].StartAddr, ed1),
                     edit_uint64(bsr->VolParams[i].EndAddr, ed2));
    //       Dmsg2(100, "bsr VolParam FI=%u LI=%u\n",
@@ -431,18 +422,6 @@ static uint32_t write_bsr(UAContext *ua, RESTORE_CTX &rx, FILE *fd)
             }
             fprintf(fd, "VolSessionId=%u\n", bsr->VolSessionId);
             fprintf(fd, "VolSessionTime=%u\n", bsr->VolSessionTime);
-//            if (bsr->VolParams[i].StartFile == bsr->VolParams[i].EndFile) {
-//               fprintf(fd, "VolFile=%u\n", bsr->VolParams[i].StartFile);
-//            } else {
-//               fprintf(fd, "VolFile=%u-%u\n", bsr->VolParams[i].StartFile,
-//                       bsr->VolParams[i].EndFile);
-//            }
-//            if (bsr->VolParams[i].StartBlock == bsr->VolParams[i].EndBlock) {
-//               fprintf(fd, "VolBlock=%u\n", bsr->VolParams[i].StartBlock);
-//            } else {
-//               fprintf(fd, "VolBlock=%u-%u\n", bsr->VolParams[i].StartBlock,
-//                       bsr->VolParams[i].EndBlock);
-//            }
             fprintf(fd, "VolAddr=%s-%s\n", edit_uint64(bsr->VolParams[i].StartAddr, ed1),
                     edit_uint64(bsr->VolParams[i].EndAddr, ed2));
    //       Dmsg2(100, "bsr VolParam FI=%u LI=%u\n",