Fix maxruntime bug #621.

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

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 81144ffa9c214f1fc27f4503c27332fba0263017..33fbc808ff45deefb856c25fe4864e87e66bbb5c 100644 (file)
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -3,6 +3,8 @@
 General:
 
 Version 2.0.2 released: xx January 2007
+28Jan08
+kes  Fix maxruntime bug #621.
 27Jan07
 kes  Get current main CVS .specs for RedHat, SuSE, Mandrake.
 26Jan07

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index c34349e25cfe36388052294e5ffd18a8b5baef94..c1d0c7d2ae1f47b858a107135e445eb801bc920d 100644 (file)
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -5,6 +5,8 @@
 
 This is a bug fix release to version 2.0.1:
 
+28Jan08
+kes  Fix maxruntime bug #621.
 27Jan07
 kes  Get current main CVS .specs for RedHat, SuSE, Mandrake.
 26Jan07

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 e1c3c5cdf745285b338e6f17030cde7dd61a2a35..2461938a3fd9f41b96733a7a9a8b4af0087296da 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.0.2"
-#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.0 b/bacula/technotes-2.0
index b4785523d5d9724e5491febe129e7f7ce2402040..e8f41341a1cf48bb310ff60a14c569d7f658109c 100644 (file)
--- a/bacula/technotes-2.0
+++ b/bacula/technotes-2.0
@@ -2,6 +2,8 @@
 
 General:
 Version 2.0.2 released: xx January 2007
+28Jan08
+kes  Fix maxruntime bug #621.
 27Jan07
 kes  Get current main CVS .specs for RedHat, SuSE, Mandrake.
 26Jan07