Fix MaxDiffInterval code as well.

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

diff --git a/bacula/src/dird/fd_cmds.c b/bacula/src/dird/fd_cmds.c
index 893835363eaf9e71580378c7ba841466db351cd1..90a151d8e9463da798ed31d4bf8d1b1ba9429340 100644 (file)
--- a/bacula/src/dird/fd_cmds.c
+++ b/bacula/src/dird/fd_cmds.c
@@ -166,7 +166,7 @@ void get_level_since_time(JCR *jcr, char *since, int since_len)
    bool do_diff = false;
    time_t now;
    utime_t last_full_time;
-   utime_t diff_time;
+   utime_t last_diff_time;
 
    since[0] = 0;
    /* If job cloned and a since time already given, use it */
@@ -196,8 +196,8 @@ void get_level_since_time(JCR *jcr, char *since, int since_len)
       if (jcr->get_JobLevel() == L_INCREMENTAL && have_full && jcr->job->MaxDiffInterval > 0) {
          /* Lookup last diff job */
          if (db_find_last_job_start_time(jcr, jcr->db, &jcr->jr, &stime, L_DIFFERENTIAL)) {
-            diff_time = str_to_utime(stime);
-            do_diff = ((now - diff_time) <= jcr->job->MaxDiffInterval);
+            last_diff_time = str_to_utime(stime);
+            do_diff = ((now - last_diff_time) >= jcr->job->MaxDiffInterval);
          }
       }
       if (have_full && jcr->job->MaxFullInterval > 0 &&

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index f33918ea77cd4a81a88dba86ba535a1ed0af8cc2..89f05cdc2973a082acba681d1b2f70f5088f756d 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -64,6 +64,7 @@ General:
 09Sep08
 kes  Correct tests for MaxFullInterval as reported by
      Ulrich Leodolter.
+kes  Fix MaxDiffInterval code as well.
 kes  Enable Win32 plugin load code in lib.
 kes  Make Verify code that computes disk checksums use the same
      algorithm as backup when dealing with sparse files.