Fix SD crash during restore

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

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 54906ff1222d5343de85cc15d06ca669d8ea5f4f..5095fbedeb41a77992af17b0eeca3ce3595f50dc 100644 (file)
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,4 +1,23 @@
 
+18Apr04
+- Found and fixed SD crash during restore.
+- Added FreeBSD Bare Metal Recovery documentation by Alex Torres 
+  Molina and others.
+- Added nice graphics produced by Aristedes Maniatis giving an
+  overall view of Bacula.
+- Changed textdomain to be "bacula" in all progs.
+- Fixed a major race condition in the job scheduler when multiple
+  simultaneous jobs is enabled. This occurred only when on job had
+  blocked another because of resource usage. This caused a deadlock
+  and CPU usage. Reported by Michel Meyers.
+- Changed the backup report to indicate "Backup OK -- with warnings
+  if any warning messages were generated.
+- Change output of restore report to indicate:
+  "Restore OK -- warning file count mismatch"
+- Make backup report say "Backup OK with warnings" if either FD or SD
+  report any non-fatal errors.
+- Modify bscan to print some elementary statistics (#Jobs, #Files, ...)
+  added to catalog.
 16Apr04
 - Modify bscan to print some elementary statistics (#Jobs, #Files, ...)
   added to catalog.

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index e3df3e177193212852172a7d3977170f9b9f3cda..62f5e152f84a2df02b33f4b5a7fdc83ac94db4d1 100644 (file)
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -10,6 +10,7 @@ Changes for 1.34.1:
 - Fixed a major race condition in the job scheduler when multiple
   simultaneous jobs is enabled. This occurred only when on job had
   blocked another because of resource usage.
+- Fixed crash in SD during restore.
 - Changed the backup report to indicate "Backup OK -- with warnings
   if any warning messages were generated.
 - Change output of restore report to indicate:

diff --git a/bacula/src/stored/read.c b/bacula/src/stored/read.c
index 0e7dbeb8caf262036f85ffd107cade06d04a96f1..4513e8a0280aacf1fd825f6d47ebe9de0659a539 100644 (file)
--- a/bacula/src/stored/read.c
+++ b/bacula/src/stored/read.c
@@ -47,8 +47,6 @@ int do_read_data(JCR *jcr)
    BSOCK *fd = jcr->file_bsock;
    int ok = TRUE;
    DEVICE *dev;
-   DEV_BLOCK *block;
-   DCR *dcr;
    
    Dmsg0(20, "Start read data.\n");
 
@@ -84,8 +82,6 @@ int do_read_data(JCR *jcr)
       return 0;
    }
 
-   block = dcr->block;
-
    /* Tell File daemon we will send data */
    bnet_fsend(fd, OK_data);
    ok = read_records(jcr, dev, record_cb, mount_next_read_volume);

diff --git a/bacula/src/version.h b/bacula/src/version.h
index aff083a2bbed4d3593024a1496fc92ef4ca04430..e8b3f2f624801d16acefc58c21a125262d055c2e 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,6 +1,6 @@
 /* */
 #undef  VERSION
-#define VERSION "1.35.0"
+#define VERSION "1.34.1"
 #define VSTRING "1"
 #define BDATE   "18 Apr 2004"
 #define LSMDATE "18Apr04"