From e9a38a3aa44ecc387d39a26cd25e6ca28da2d618 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 22 Jul 2008 14:48:21 +0000 Subject: [PATCH] Minor cleanups git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.4@7416 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/ChangeLog | 17 ++++++++++++++++ bacula/ReleaseNotes | 24 ++++++++++++++++++++++- bacula/src/c | 4 ++-- bacula/src/jcr.h | 4 ++-- bacula/src/lib/bsock.h | 4 ++-- bacula/src/lib/message.c | 6 +++--- bacula/src/qt-console/console/console.cpp | 16 --------------- bacula/src/qt-console/main.cpp | 2 ++ bacula/src/qt-console/mainwin.cpp | 6 ------ bacula/technotes-2.4 | 2 ++ 10 files changed, 53 insertions(+), 32 deletions(-) diff --git a/bacula/ChangeLog b/bacula/ChangeLog index 76c869ad94..8264b6ff40 100644 --- a/bacula/ChangeLog +++ b/bacula/ChangeLog @@ -1,6 +1,23 @@ Technical notes on version 2.4.x General: +Release Version 2.4.2 +22Jul08 +kes Minor cleanups. +kes Fix bug #1125 which reports a SD crash at the end of a tape + during restore. It was a debug statement that should not be + in a release. +20Jul08 +ebl fix #1034 by setting big timeout on mysql connections +19Jul08 +kes Do partial integration of the Win32 bat build created by Eric. +kes Fix bat not to block. +15Jul08 +kes Ensure that SD tried to mount a volume not in an autochanger + at least once before asking for operator intervention. +kes Fix a pthreads bug in the Win32 pthreads emulation code. + + Release Version 2.4.1 07Jul08 kes Clear in-use bit on vol when unused while swapping. diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes index 2dc413ebeb..a76225d177 100644 --- a/bacula/ReleaseNotes +++ b/bacula/ReleaseNotes @@ -1,5 +1,5 @@ - Release Notes for Bacula 2.4.1 + Release Notes for Bacula 2.4.2 Bacula code: Total files = 500 Total lines = 188,654 (*.h *.c *.in) @@ -14,6 +14,28 @@ reparse directories backed up, you must explicitly include them in your FileSet. ============================================================== +Release 2.4.2 + This is a bug fix for version 2.4.1. + +Bugs Fixed: + 1034, 1125 + +Change Summary: +- Fix bug #1125 which reports a SD crash at the end of a tape + during restore. It was a debug statement that should not be + in a release. +- Fix #1034 by setting big timeout on mysql connections +- Do partial integration of the Win32 bat build created by Eric. +- Ensure that SD tried to mount a volume not in an autochanger + at least once before asking for operator intervention. +- Fix a pthreads bug in the Win32 pthreads emulation code affects only + version 2.5.x and above. + + +================================================================= + +Release 2.4.1: + Bugs Fixed: 1103, 1100, 1105, 1094, 1109, 1106, 1101, 1102, 1112 1117, 1116, 1097. diff --git a/bacula/src/c b/bacula/src/c index 218100b713..96589d45e3 100644 --- a/bacula/src/c +++ b/bacula/src/c @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2007 Free Software Foundation Europe e.V. + Copyright (C) 2000-2008 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Bacula® is a registered trademark of John Walker. + Bacula® is a registered trademark of Kern Sibbald. The licensor of Bacula is the Free Software Foundation Europe (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. diff --git a/bacula/src/jcr.h b/bacula/src/jcr.h index 76a1916e7d..f928a548c0 100644 --- a/bacula/src/jcr.h +++ b/bacula/src/jcr.h @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2007 Free Software Foundation Europe e.V. + Copyright (C) 2000-2008 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Bacula® is a registered trademark of John Walker. + Bacula® is a registered trademark of Kern Sibbald. The licensor of Bacula is the Free Software Foundation Europe (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. diff --git a/bacula/src/lib/bsock.h b/bacula/src/lib/bsock.h index 08e32859de..eba26e872c 100644 --- a/bacula/src/lib/bsock.h +++ b/bacula/src/lib/bsock.h @@ -107,8 +107,8 @@ public: int set_nonblocking(); int set_blocking(); void restore_blocking(int flags); - int wait_data(int sec, int usec); - int wait_data_intr(int sec, int usec); + int wait_data(int sec, int usec=0); + int wait_data_intr(int sec, int usec=0); bool authenticate_director(const char *name, const char *password, TLS_CONTEXT *tls_ctx, char *msg, int msglen); diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c index ac0e8e00f0..933e2fb5e7 100644 --- a/bacula/src/lib/message.c +++ b/bacula/src/lib/message.c @@ -875,10 +875,10 @@ d_msg(const char *file, int line, int level, const char *fmt,...) if (trace) { if (!trace_fd) { char fn[200]; -#ifdef HAVE_WIN32 - bsnprintf(fn, sizeof(fn), "%s/%s.trace", working_directory ? working_directory : ".", my_name); -#else +#if defined(HAVE_WIN32) bsnprintf(fn, sizeof(fn), "%s.trace", my_name); +#else + bsnprintf(fn, sizeof(fn), "%s/%s.trace", working_directory ? working_directory : ".", my_name); #endif trace_fd = fopen(fn, "a+b"); } diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp index 76415412e7..9f69e61a6c 100644 --- a/bacula/src/qt-console/console/console.cpp +++ b/bacula/src/qt-console/console/console.cpp @@ -612,27 +612,11 @@ int Console::read() int stat = 0; while (m_sock) { for (;;) { -// bool enabled; -// if (mainWin->m_commDebug) Pmsg0(000, "bnet_wait_data_intr\n"); stat = m_sock->wait_data_intr(0, 50000); if (stat > 0) { break; } -// if (mainWin->m_commDebug) Pmsg1(000, "wait status=%d\n", stat); -#ifdef xxx - if (m_notifier) { - enabled = m_notifier->isEnabled(); - if (enabled) { - m_notifier->setEnabled(false); - } - } -#endif app->processEvents(); -#ifdef xxx - if (m_notifier && enabled) { - m_notifier->setEnabled(true); - } -#endif if (m_api_set && m_messages_pending && m_notifier->isEnabled()) { write_dir(".messages"); m_messages_pending = false; diff --git a/bacula/src/qt-console/main.cpp b/bacula/src/qt-console/main.cpp index cad8b94e80..3daa38a809 100644 --- a/bacula/src/qt-console/main.cpp +++ b/bacula/src/qt-console/main.cpp @@ -123,7 +123,9 @@ int main(int argc, char *argv[]) } OSDependentInit(); +#ifdef HAVE_WIN32 WSA_Init(); /* Initialize Windows sockets */ +#endif if (configfile == NULL) { configfile = bstrdup(CONFIG_FILE); diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp index 33b4d0296b..343ebd01c1 100644 --- a/bacula/src/qt-console/mainwin.cpp +++ b/bacula/src/qt-console/mainwin.cpp @@ -54,8 +54,6 @@ #include "jobgraphs/jobplot.h" #endif -extern bool trace; - /* * Daemon message callback */ @@ -66,10 +64,6 @@ void message_callback(int /* type */, char *msg) MainWin::MainWin(QWidget *parent) : QMainWindow(parent) { -#ifdef HAVE_WIN32 - my_name_is(0, NULL, "bat"); - set_trace(true); -#endif m_isClosing = false; m_dtformat = "yyyy-MM-dd HH:mm:ss"; mainWin = this; diff --git a/bacula/technotes-2.4 b/bacula/technotes-2.4 index e58c3a6dd0..8ad2670463 100644 --- a/bacula/technotes-2.4 +++ b/bacula/technotes-2.4 @@ -1,7 +1,9 @@ Technical notes on version 2.4 General: +Release Version 2.4.2 22Jul08 +kes Minor cleanups. kes Fix bug #1125 which reports a SD crash at the end of a tape during restore. It was a debug statement that should not be in a release. -- 2.39.5