Fix maxruntime bug #621.

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

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index 5063490ade5b6bb4b3f908a02754e35f166e95f1..1ca59f857f0cba186a56162b2400cb951cdf7a2b 100644 (file)
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -565,8 +565,6 @@ static bool job_check_maxwaittime(JCR *control_jcr, JCR *jcr)
  */
 static bool job_check_maxruntime(JCR *control_jcr, JCR *jcr)
 {
-   bool cancel = false;
-
    if (jcr->job->MaxRunTime == 0 || job_canceled(jcr)) {
       return false;
    }
@@ -606,7 +604,7 @@ static bool job_check_maxruntime(JCR *control_jcr, JCR *jcr)
    Dmsg3(200, "MaxRunTime result: %scancel JCR %p (%s)\n",
          cancel ? "" : "do not ", jcr, jcr->job);
 #endif
-   return cancel;
+   return true;
 }
 
 /*

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 60553d41a3da772d50fc54e4382a8478c79878fd..78cd11f5c2d3b769b7971fc3c753cac166fcd625 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.1.1"
-#define BDATE   "26 January 2007"
-#define LSMDATE "26Jan07"
+#define BDATE   "28 January 2007"
+#define LSMDATE "28Jan07"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2007 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2007"       /* year for copyright messages in progs */

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index c261140f06ebd739f9bc05c2b7c639cef3a1586a..bac697dbf469af103e727f7ecc0bdd7ef46a4505 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,8 +1,10 @@
               Technical notes on version 2.1
 
 General:
+28Jan08 
+kes  Fix maxruntime bug #621.
 26Jan07
-ebl  Implements the include JobID in spool file name project.
+ebl  Implement the include JobID in spool file name project.
 kes  Reorder projects file in order determined by Jan 2007 vote.
 kes  Implement item #12 on project list -- quick release of FD by
      the SD.