From 43d2da3886ad305e54f396badd2cbe51adcd1810 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 20 Sep 2007 08:31:10 +0000
Subject: [PATCH] Update technotes

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5604 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/kernstodo                  |  1 +
 bacula/patches/2.2.4-verify.patch | 75 +++++++++++++++++++++++++++++++
 bacula/src/dird/verify.c          | 10 ++---
 bacula/src/lib/jcr.c              |  3 +-
 bacula/technotes-2.3              |  8 +++-
 5 files changed, 87 insertions(+), 10 deletions(-)
 create mode 100644 bacula/patches/2.2.4-verify.patch

diff --git a/bacula/kernstodo b/bacula/kernstodo
index aa994f4d83..d840d86f2d 100644
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -68,6 +68,7 @@ Professional Needs:
    See email of 21Aug2007 for details.
 
 Priority:
+- Erabt if min_block_size > max_block_size
 - KIWI
 - Implement wait on multiple objects
    - Multiple max times
diff --git a/bacula/patches/2.2.4-verify.patch b/bacula/patches/2.2.4-verify.patch
new file mode 100644
index 0000000000..21e9af3442
--- /dev/null
+++ b/bacula/patches/2.2.4-verify.patch
@@ -0,0 +1,75 @@
+ This patch fixes bug #958 A Verify catalog Job that has differences reports Verify OK.
+
+ Apply it to version 2.2.4 (possibly earlier versions with):
+
+ cd <bacula-source>
+ patch -p0 <2.2.4-verify.patch
+ ./configure (your options)
+ make
+ ...
+ make install
+
+Index: src/dird/verify.c
+===================================================================
+--- src/dird/verify.c	(revision 5553)
++++ src/dird/verify.c	(working copy)
+@@ -332,13 +332,10 @@
+    }
+ 
+    stat = wait_for_job_termination(jcr);
+-   if (stat == JS_Terminated) {
+-      verify_cleanup(jcr, stat);
+-      return true;
+-   }
++   verify_cleanup(jcr, stat);
++   return true;
+ 
+ bail_out:
+-   verify_cleanup(jcr, JS_ErrorTerminated);
+    return false;
+ }
+ 
+@@ -421,7 +418,7 @@
+    jobstatus_to_ascii(jcr->FDJobStatus, fd_term_msg, sizeof(fd_term_msg));
+    if (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG) {
+       jobstatus_to_ascii(jcr->SDJobStatus, sd_term_msg, sizeof(sd_term_msg));
+-   Jmsg(jcr, msg_type, 0, _("Bacula %s %s (%s): %s\n"
++      Jmsg(jcr, msg_type, 0, _("Bacula %s %s (%s): %s\n"
+ "  Build OS:               %s %s %s\n"
+ "  JobId:                  %d\n"
+ "  Job:                    %s\n"
+@@ -456,7 +453,7 @@
+          sd_term_msg,
+          term_msg);
+    } else {
+-   Jmsg(jcr, msg_type, 0, _("Bacula %s %s (%s): %s\n"
++      Jmsg(jcr, msg_type, 0, _("Bacula %s %s (%s): %s\n"
+ "  Build:                  %s %s %s\n"
+ "  JobId:                  %d\n"
+ "  Job:                    %s\n"
+@@ -750,7 +747,9 @@
+       stat = JS_Differences;
+    }
+    free_pool_memory(fname);
+-   set_jcr_job_status(jcr, stat);
++   if (!job_canceled(jcr)) {
++      jcr->JobStatus = stat;
++   }
+    return stat == JS_Terminated;
+ }
+ 
+Index: src/lib/jcr.c
+===================================================================
+--- src/lib/jcr.c	(revision 5553)
++++ src/lib/jcr.c	(working copy)
+@@ -614,9 +614,8 @@
+          /* Override more minor status */
+          jcr->JobStatus = JobStatus;
+          break;
+-      default:
+-         break;
+       }
++      break;
+    default:
+       jcr->JobStatus = JobStatus;
+    }
diff --git a/bacula/src/dird/verify.c b/bacula/src/dird/verify.c
index 17e1443c50..c7863f9b05 100644
--- a/bacula/src/dird/verify.c
+++ b/bacula/src/dird/verify.c
@@ -332,13 +332,9 @@ bool do_verify(JCR *jcr)
    }
 
    stat = wait_for_job_termination(jcr);
-   if (stat == JS_Terminated) {
-      verify_cleanup(jcr, stat);
-      return true;
-   }
+   verify_cleanup(jcr, stat);
 
 bail_out:
-   verify_cleanup(jcr, JS_ErrorTerminated);
    return false;
 }
 
@@ -750,7 +746,9 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId)
       stat = JS_Differences;
    }
    free_pool_memory(fname);
-   set_jcr_job_status(jcr, stat);
+   if (!job_canceled(jcr)) {
+      jcr->JobStatus = stat;
+   }
    return stat == JS_Terminated;
 }
 
diff --git a/bacula/src/lib/jcr.c b/bacula/src/lib/jcr.c
index ef542cc09e..0835c36a30 100644
--- a/bacula/src/lib/jcr.c
+++ b/bacula/src/lib/jcr.c
@@ -616,9 +616,8 @@ void set_jcr_job_status(JCR *jcr, int JobStatus)
          /* Override more minor status */
          jcr->JobStatus = JobStatus;
          break;
-      default:
-         break;
       }
+      break;
    default:
       jcr->JobStatus = JobStatus;
    }
diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index f193bec071..febe9b21ac 100644
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -1,8 +1,12 @@
               Technical notes on version 2.3
 
 General:
-20Sep07
-ebl  Fix #955 bug which was introduce with regexwhere relocation.
+0Sep07
+kes  Apply 2.2.4-poll-mount fix, that resolves bug #908 where a tape
+     is not properly mounted (recognized) during a poll.
+kes  Apply 2.2.4-verify patch that resolves bug #958.  A Verify catalog
+     Job that has differences reports Verify OK.
+ebl  Fixes #955 bug seg fault in Dir introduced  with regexwhere relocation.
 17Sep07
 ebl  Add an option to operate on all pools with update vol parameters.
      This complete the project 20. Patch from Nigel Stepp.
-- 
2.39.5