From f0b827ee4b1e57617576ec660256f876df5d0646 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 4 Jul 2008 14:11:23 +0000
Subject: [PATCH] Use Qmsg() in job.c watchdog callback.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.4@7303 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/ChangeLog      | 16 ++++++++++++++++
 bacula/ReleaseNotes   | 19 ++++++++++++++++++-
 bacula/src/dird/job.c |  4 ++--
 bacula/src/version.h  |  4 ++--
 bacula/technotes-2.4  |  4 ++++
 5 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 99d0c01346..b33dfe17f9 100644
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,6 +1,22 @@
               Technical notes on version 2.4.x
 
 General:
+Release Beta version 2.4.1-b2
+04Jul08 
+kes  Use Qmsg() in job.c watchdog callback.
+03Jul08
+kes  Release main control rwlock if ABORTing.
+kes  Make watchdog connect timeout queue messages rather than sending
+     directly to avoid lock conflicts with the real thread.
+kes  Remove const char that causes problems with Python, which has
+     older 'incorrect' headers.
+kes  Add const char in dbd.c to avoid compiler warnings.
+02Jul08
+kes  Fix mtx-changer to detect both versions of Ubuntu (Debian)
+     mt. This fixes bug #1116.
+kes  Fix failure of 2drive-concurrent-test. Always read label;
+     clear_unload() only after drive is defined in acquire_for_read().
+
 Release Beta version 2.4.1-b1
 01Jul08
 kes  Back out bad src/lib/base64.c change.
diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index 07301011e0..ec08701554 100644
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -1,5 +1,5 @@
 
-       Release Notes for Bacula 2.4.1-b1
+       Release Notes for Bacula 2.4.1-b2
 
   Bacula code: Total files = 500 Total lines = 188,654 (*.h *.c *.in)
 
@@ -14,6 +14,23 @@ reparse directories backed up, you must explicitly include them
 in your FileSet.
 ==============================================================
 
+Release Beta version 2.4.1-b2
+kes  Use Qmsg() in job.c watchdog callback.
+kes  Release main control rwlock if ABORTing.
+kes  Make watchdog connect timeout queue messages rather than sending
+     directly to avoid lock conflicts with the real thread.
+kes  Remove const char that causes problems with Python, which has
+     older 'incorrect' headers.
+kes  Add const char in dbd.c to avoid compiler warnings.
+kes  Fix mtx-changer to detect both versions of Ubuntu (Debian)
+     mt. This fixes bug #1116.
+kes  Fix failure of 2drive-concurrent-test. Always read label;
+     clear_unload() only after drive is defined in acquire_for_read().
+
+
+==========
+Release 2.4.1-b1
+
 This release consists of a number of bug fixes since version 2.4.0.
 Important sections of the Storage daemon mount system have been
 enhanced to correctly loading autochanger volumes when the drive
diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index e1e96dbe28..ec0c3b6fb2 100644
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -494,12 +494,12 @@ static void job_monitor_watchdog(watchdog_t *self)
       /* check MaxWaitTime */
       if (job_check_maxwaittime(control_jcr, jcr)) {
          set_jcr_job_status(jcr, JS_Canceled);
-         Jmsg(jcr, M_FATAL, 0, _("Max wait time exceeded. Job canceled.\n"));
+         Qmsg(jcr, M_FATAL, 0, _("Max wait time exceeded. Job canceled.\n"));
          cancel = true;
       /* check MaxRunTime */
       } else if (job_check_maxruntime(control_jcr, jcr)) {
          set_jcr_job_status(jcr, JS_Canceled);
-         Jmsg(jcr, M_FATAL, 0, _("Max run time exceeded. Job canceled.\n"));
+         Qmsg(jcr, M_FATAL, 0, _("Max run time exceeded. Job canceled.\n"));
          cancel = true;
       }
 
diff --git a/bacula/src/version.h b/bacula/src/version.h
index f2ce173d8c..d2f5499ef4 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.4.1-b2"
-#define BDATE   "02 July 2008"
-#define LSMDATE "02Jul08"
+#define BDATE   "04 July 2008"
+#define LSMDATE "04Jul08"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2008"       /* year for copyright messages in progs */
diff --git a/bacula/technotes-2.4 b/bacula/technotes-2.4
index 7f463bb4f1..5484897ca0 100644
--- a/bacula/technotes-2.4
+++ b/bacula/technotes-2.4
@@ -1,6 +1,10 @@
               Technical notes on version 2.4
 
 General:
+
+Release Beta version 2.4.1-b2
+04Jul08 
+kes  Use Qmsg() in job.c watchdog callback.
 03Jul08
 kes  Release main control rwlock if ABORTing.
 kes  Make watchdog connect timeout queue messages rather than sending
-- 
2.39.5