kes Print the Volume purged message only for real jobs to keep

[bacula/bacula] / bacula / src / dird / verify.c

diff --git a/bacula/src/dird/verify.c b/bacula/src/dird/verify.c
index bae78c22105efbc36fd78ae530a1eb6deb4425d6..a4075474467879e12c2df4c6f7ca48ef4f545ed3 100644 (file)
--- a/bacula/src/dird/verify.c
+++ b/bacula/src/dird/verify.c
@@ -7,18 +7,18 @@
  *  Basic tasks done here:
  *     Open DB
  *     Open connection with File daemon and pass him commands
  *  Basic tasks done here:
  *     Open DB
  *     Open connection with File daemon and pass him commands

- *      to do the verify.
+ *       to do the verify.

  *     When the File daemon sends the attributes, compare them to
  *     When the File daemon sends the attributes, compare them to

- *      what is in the DB.
+ *       what is in the DB.

  *
  *   Version $Id$
  */
 /*
  *
  *   Version $Id$
  */
 /*

-   Copyright (C) 2000-2005 Kern Sibbald
+   Copyright (C) 2000-2006 Kern Sibbald

 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License

-   version 2 as ammended with additional clauses defined in the
+   version 2 as amended with additional clauses defined in the

    file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
    file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,


@@ -33,9 +33,6 @@
 #include "dird.h"
 #include "findlib/find.h"
 
 #include "dird.h"
 #include "findlib/find.h"
 

-/* Imported Global Variables */
-extern int debug_level;
-

 /* Commands sent to File daemon */
 static char verifycmd[]    = "verify level=%s\n";
 static char storaddr[]     = "storage address=%s port=%d ssl=0\n";
 /* Commands sent to File daemon */
 static char verifycmd[]    = "verify level=%s\n";
 static char storaddr[]     = "storage address=%s port=%d ssl=0\n";


@@ -43,6 +40,7 @@ static char storaddr[]     = "storage address=%s port=%d ssl=0\n";
 /* Responses received from File daemon */
 static char OKverify[]    = "2000 OK verify\n";
 static char OKstore[]     = "2000 OK storage\n";
 /* Responses received from File daemon */
 static char OKverify[]    = "2000 OK verify\n";
 static char OKstore[]     = "2000 OK storage\n";

+static char OKbootstrap[] = "2000 OK bootstrap\n";

 
 /* Forward referenced functions */
 static void prt_fname(JCR *jcr);
 
 /* Forward referenced functions */
 static void prt_fname(JCR *jcr);


@@ -59,97 +57,77 @@ bool do_verify_init(JCR *jcr)
    JobId_t verify_jobid = 0;
    const char *Name;
 
    JobId_t verify_jobid = 0;
    const char *Name;
 

-   memset(&jcr->target_jr, 0, sizeof(jcr->target_jr));
+   free_wstorage(jcr);                   /* we don't write */
+
+   memset(&jcr->previous_jr, 0, sizeof(jcr->previous_jr));

 
    Dmsg1(9, "bdird: created client %s record\n", jcr->client->hdr.name);
 
    /*
 
    Dmsg1(9, "bdird: created client %s record\n", jcr->client->hdr.name);
 
    /*

-    * Find JobId of last job that ran. E.g.
-    *  for VERIFY_CATALOG we want the JobId of the last INIT.
-    *  for VERIFY_VOLUME_TO_CATALOG, we want the JobId of the
-    *      last backup Job.
+    * Find JobId of last job that ran.  E.g.
+    *   for VERIFY_CATALOG we want the JobId of the last INIT.
+    *   for VERIFY_VOLUME_TO_CATALOG, we want the JobId of the
+    *       last backup Job.

     */
    if (jcr->JobLevel == L_VERIFY_CATALOG ||
        jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG ||
        jcr->JobLevel == L_VERIFY_DISK_TO_CATALOG) {
       memcpy(&jr, &jcr->jr, sizeof(jr));
       if (jcr->verify_job &&
     */
    if (jcr->JobLevel == L_VERIFY_CATALOG ||
        jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG ||
        jcr->JobLevel == L_VERIFY_DISK_TO_CATALOG) {
       memcpy(&jr, &jcr->jr, sizeof(jr));
       if (jcr->verify_job &&

-         (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG ||
-          jcr->JobLevel == L_VERIFY_DISK_TO_CATALOG)) {
-        Name = jcr->verify_job->hdr.name;
+          (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG ||
+           jcr->JobLevel == L_VERIFY_DISK_TO_CATALOG)) {
+         Name = jcr->verify_job->hdr.name;

       } else {
       } else {

-        Name = NULL;
+         Name = NULL;

       }
       Dmsg1(100, "find last jobid for: %s\n", NPRT(Name));
       if (!db_find_last_jobid(jcr, jcr->db, Name, &jr)) {
       }
       Dmsg1(100, "find last jobid for: %s\n", NPRT(Name));
       if (!db_find_last_jobid(jcr, jcr->db, Name, &jr)) {

-        if (jcr->JobLevel == L_VERIFY_CATALOG) {
-           Jmsg(jcr, M_FATAL, 0, _(
+         if (jcr->JobLevel == L_VERIFY_CATALOG) {
+            Jmsg(jcr, M_FATAL, 0, _(

                  "Unable to find JobId of previous InitCatalog Job.\n"
                  "Please run a Verify with Level=InitCatalog before\n"
                  "running the current Job.\n"));
                  "Unable to find JobId of previous InitCatalog Job.\n"
                  "Please run a Verify with Level=InitCatalog before\n"
                  "running the current Job.\n"));

-         } else {
-           Jmsg(jcr, M_FATAL, 0, _(
+          } else {
+            Jmsg(jcr, M_FATAL, 0, _(

                  "Unable to find JobId of previous Job for this client.\n"));
                  "Unable to find JobId of previous Job for this client.\n"));

-        }
-        return false;
+         }
+         return false;

       }
       verify_jobid = jr.JobId;
       Dmsg1(100, "Last full jobid=%d\n", verify_jobid);
    }
    /*
     * Now get the job record for the previous backup that interests
       }
       verify_jobid = jr.JobId;
       Dmsg1(100, "Last full jobid=%d\n", verify_jobid);
    }
    /*
     * Now get the job record for the previous backup that interests

-    *  us. We use the verify_jobid that we found above.
+    *   us. We use the verify_jobid that we found above.

     */
    if (jcr->JobLevel == L_VERIFY_CATALOG ||
        jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG ||
        jcr->JobLevel == L_VERIFY_DISK_TO_CATALOG) {
     */
    if (jcr->JobLevel == L_VERIFY_CATALOG ||
        jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG ||
        jcr->JobLevel == L_VERIFY_DISK_TO_CATALOG) {

-      jcr->target_jr.JobId = verify_jobid;
-      if (!db_get_job_record(jcr, jcr->db, &jcr->target_jr)) {
+      jcr->previous_jr.JobId = verify_jobid;
+      if (!db_get_job_record(jcr, jcr->db, &jcr->previous_jr)) {

          Jmsg(jcr, M_FATAL, 0, _("Could not get job record for previous Job. ERR=%s"),
          Jmsg(jcr, M_FATAL, 0, _("Could not get job record for previous Job. ERR=%s"),

-             db_strerror(jcr->db));
-        return false;
+              db_strerror(jcr->db));
+         return false;

       }
       }

-      if (jcr->target_jr.JobStatus != 'T') {
+      if (jcr->previous_jr.JobStatus != 'T') {

          Jmsg(jcr, M_FATAL, 0, _("Last Job %d did not terminate normally. JobStatus=%c\n"),
          Jmsg(jcr, M_FATAL, 0, _("Last Job %d did not terminate normally. JobStatus=%c\n"),

-           verify_jobid, jcr->target_jr.JobStatus);
-        return false;
+            verify_jobid, jcr->previous_jr.JobStatus);
+         return false;

       }
       Jmsg(jcr, M_INFO, 0, _("Verifying against JobId=%d Job=%s\n"),
       }
       Jmsg(jcr, M_INFO, 0, _("Verifying against JobId=%d Job=%s\n"),

-        jcr->target_jr.JobId, jcr->target_jr.Job);
+         jcr->previous_jr.JobId, jcr->previous_jr.Job);

    }
 
    /*
     * If we are verifying a Volume, we need the Storage
    }
 
    /*
     * If we are verifying a Volume, we need the Storage

-    *  daemon, so open a connection, otherwise, just
-    *  create a dummy authorization key (passed to
-    *  File daemon but not used).
+    *   daemon, so open a connection, otherwise, just
+    *   create a dummy authorization key (passed to
+    *   File daemon but not used).

     */
    if (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG) {
     */
    if (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG) {

-      RBSR *bsr = new_bsr();
-      UAContext *ua;
-      bsr->JobId = jcr->target_jr.JobId;
-      ua = new_ua_context(jcr);
-      complete_bsr(ua, bsr);
-      bsr->fi = new_findex();
-      bsr->fi->findex = 1;
-      bsr->fi->findex2 = jcr->target_jr.JobFiles;
-      jcr->ExpectedFiles = write_bsr_file(ua, bsr);
-      if (jcr->ExpectedFiles == 0) {
-        free_ua_context(ua);
-        free_bsr(bsr);
-        return false;
-      }
-      if (jcr->RestoreBootstrap) {
-        free(jcr->RestoreBootstrap);
+      if (!create_restore_bootstrap_file(jcr)) {
+         return false;

       }
       }

-      POOLMEM *fname = get_pool_memory(PM_MESSAGE);
-      make_unique_restore_filename(ua, &fname);
-      jcr->RestoreBootstrap = bstrdup(fname);
-      free_ua_context(ua);
-      free_bsr(bsr);
-      free_pool_memory(fname);
-      jcr->needs_sd = true;
-

    } else {
       jcr->sd_auth_key = bstrdup("dummy");    /* dummy Storage daemon key */
    }
    } else {
       jcr->sd_auth_key = bstrdup("dummy");    /* dummy Storage daemon key */
    }


@@ -157,7 +135,7 @@ bool do_verify_init(JCR *jcr)
    if (jcr->JobLevel == L_VERIFY_DISK_TO_CATALOG && jcr->verify_job) {
       jcr->fileset = jcr->verify_job->fileset;
    }
    if (jcr->JobLevel == L_VERIFY_DISK_TO_CATALOG && jcr->verify_job) {
       jcr->fileset = jcr->verify_job->fileset;
    }

-   Dmsg2(100, "ClientId=%u JobLevel=%c\n", jcr->target_jr.ClientId, jcr->JobLevel);
+   Dmsg2(100, "ClientId=%u JobLevel=%c\n", jcr->previous_jr.ClientId, jcr->JobLevel);

    return true;
 }
 
    return true;
 }
 


@@ -166,13 +144,14 @@ bool do_verify_init(JCR *jcr)
  * Do a verification of the specified files against the Catlaog
  *
  *  Returns:  false on failure
  * Do a verification of the specified files against the Catlaog
  *
  *  Returns:  false on failure

- *           true  on success
+ *            true  on success

  */
 bool do_verify(JCR *jcr)
 {
    const char *level;
    BSOCK   *fd;
    int stat;
  */
 bool do_verify(JCR *jcr)
 {
    const char *level;
    BSOCK   *fd;
    int stat;

+   char ed1[100];

 
    if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) {
       Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
 
    if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) {
       Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));


@@ -180,8 +159,8 @@ bool do_verify(JCR *jcr)
    }
 
    /* Print Job Start message */
    }
 
    /* Print Job Start message */

-   Jmsg(jcr, M_INFO, 0, _("Start Verify JobId=%d Level=%s Job=%s\n"),
-      jcr->JobId, level_to_str(jcr->JobLevel), jcr->Job);
+   Jmsg(jcr, M_INFO, 0, _("Start Verify JobId=%s Level=%s Job=%s\n"),
+      edit_uint64(jcr->JobId, ed1), level_to_str(jcr->JobLevel), jcr->Job);

 
    if (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG) {
       /*
 
    if (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG) {
       /*


@@ -189,21 +168,25 @@ bool do_verify(JCR *jcr)
        */
       set_jcr_job_status(jcr, JS_Blocked);
       if (!connect_to_storage_daemon(jcr, 10, SDConnectTimeout, 1)) {
        */
       set_jcr_job_status(jcr, JS_Blocked);
       if (!connect_to_storage_daemon(jcr, 10, SDConnectTimeout, 1)) {

-        return false;
+         return false;

       }
       /*
        * Now start a job with the Storage daemon
        */
       }
       /*
        * Now start a job with the Storage daemon
        */

-      if (!start_storage_daemon_job(jcr, jcr->storage, SD_READ)) {
-        return false;
+      if (!start_storage_daemon_job(jcr, jcr->rstorage, NULL)) {
+         return false;
+      }
+      if (!bnet_fsend(jcr->store_bsock, "run")) {
+         return false;

       }
       /*
        * Now start a Storage daemon message thread
        */
       if (!start_storage_daemon_message_thread(jcr)) {
       }
       /*
        * Now start a Storage daemon message thread
        */
       if (!start_storage_daemon_message_thread(jcr)) {

-        return false;
+         return false;

       }
       Dmsg0(50, "Storage daemon connection OK\n");
       }
       Dmsg0(50, "Storage daemon connection OK\n");

+

    }
    /*
     * OK, now connect to the File daemon
    }
    /*
     * OK, now connect to the File daemon


@@ -230,7 +213,7 @@ bool do_verify(JCR *jcr)
 
    /*
     * Send Level command to File daemon, as well
 
    /*
     * Send Level command to File daemon, as well

-    *  as the Storage address if appropriate.
+    *   as the Storage address if appropriate.

     */
    switch (jcr->JobLevel) {
    case L_VERIFY_INIT:
     */
    switch (jcr->JobLevel) {
    case L_VERIFY_INIT:


@@ -243,24 +226,25 @@ bool do_verify(JCR *jcr)
       /*
        * send Storage daemon address to the File daemon
        */
       /*
        * send Storage daemon address to the File daemon
        */

-      if (jcr->store->SDDport == 0) {
-        jcr->store->SDDport = jcr->store->SDport;
+      if (jcr->rstore->SDDport == 0) {
+         jcr->rstore->SDDport = jcr->rstore->SDport;

       }
       }

-      bnet_fsend(fd, storaddr, jcr->store->address, jcr->store->SDDport);
+      bnet_fsend(fd, storaddr, jcr->rstore->address, jcr->rstore->SDDport);

       if (!response(jcr, fd, OKstore, "Storage", DISPLAY_ERROR)) {
       if (!response(jcr, fd, OKstore, "Storage", DISPLAY_ERROR)) {

-        return false;
+         return false;

       }
 
       /*
        * Send the bootstrap file -- what Volumes/files to restore
        */
       }
 
       /*
        * Send the bootstrap file -- what Volumes/files to restore
        */

-      if (!send_bootstrap_file(jcr)) {
-        return false;
+      if (!send_bootstrap_file(jcr, fd) ||
+          !response(jcr, fd, OKbootstrap, "Bootstrap", DISPLAY_ERROR)) {
+         return false;

       }
 
       if (!jcr->RestoreBootstrap) {
          Jmsg0(jcr, M_FATAL, 0, _("Deprecated feature ... use bootstrap.\n"));
       }
 
       if (!jcr->RestoreBootstrap) {
          Jmsg0(jcr, M_FATAL, 0, _("Deprecated feature ... use bootstrap.\n"));

-        return false;
+         return false;

       }
 
       level = "volume";
       }
 
       level = "volume";


@@ -273,11 +257,11 @@ bool do_verify(JCR *jcr)
       break;
    default:
       Jmsg2(jcr, M_FATAL, 0, _("Unimplemented Verify level %d(%c)\n"), jcr->JobLevel,
       break;
    default:
       Jmsg2(jcr, M_FATAL, 0, _("Unimplemented Verify level %d(%c)\n"), jcr->JobLevel,

-        jcr->JobLevel);
+         jcr->JobLevel);

       return false;
    }
 
       return false;
    }
 

-   if (!send_run_before_and_after_commands(jcr)) {
+   if (!send_runscripts_commands(jcr)) {

       return false;
    }
 
       return false;
    }
 


@@ -298,27 +282,27 @@ bool do_verify(JCR *jcr)
    switch (jcr->JobLevel) {
    case L_VERIFY_CATALOG:
       Dmsg0(10, "Verify level=catalog\n");
    switch (jcr->JobLevel) {
    case L_VERIFY_CATALOG:
       Dmsg0(10, "Verify level=catalog\n");

-      jcr->sd_msg_thread_done = true;  /* no SD msg thread, so it is done */
+      jcr->sd_msg_thread_done = true;   /* no SD msg thread, so it is done */

       jcr->SDJobStatus = JS_Terminated;
       jcr->SDJobStatus = JS_Terminated;

-      get_attributes_and_compare_to_catalog(jcr, jcr->target_jr.JobId);
+      get_attributes_and_compare_to_catalog(jcr, jcr->previous_jr.JobId);

       break;
 
    case L_VERIFY_VOLUME_TO_CATALOG:
       Dmsg0(10, "Verify level=volume\n");
       break;
 
    case L_VERIFY_VOLUME_TO_CATALOG:
       Dmsg0(10, "Verify level=volume\n");

-      get_attributes_and_compare_to_catalog(jcr, jcr->target_jr.JobId);
+      get_attributes_and_compare_to_catalog(jcr, jcr->previous_jr.JobId);

       break;
 
    case L_VERIFY_DISK_TO_CATALOG:
       Dmsg0(10, "Verify level=disk_to_catalog\n");
       break;
 
    case L_VERIFY_DISK_TO_CATALOG:
       Dmsg0(10, "Verify level=disk_to_catalog\n");

-      jcr->sd_msg_thread_done = true;  /* no SD msg thread, so it is done */
+      jcr->sd_msg_thread_done = true;   /* no SD msg thread, so it is done */

       jcr->SDJobStatus = JS_Terminated;
       jcr->SDJobStatus = JS_Terminated;

-      get_attributes_and_compare_to_catalog(jcr, jcr->target_jr.JobId);
+      get_attributes_and_compare_to_catalog(jcr, jcr->previous_jr.JobId);

       break;
 
    case L_VERIFY_INIT:
       /* Build catalog */
       Dmsg0(10, "Verify level=init\n");
       break;
 
    case L_VERIFY_INIT:
       /* Build catalog */
       Dmsg0(10, "Verify level=init\n");

-      jcr->sd_msg_thread_done = true;  /* no SD msg thread, so it is done */
+      jcr->sd_msg_thread_done = true;   /* no SD msg thread, so it is done */

       jcr->SDJobStatus = JS_Terminated;
       get_attributes_and_put_in_catalog(jcr);
       break;
       jcr->SDJobStatus = JS_Terminated;
       get_attributes_and_put_in_catalog(jcr);
       break;


@@ -352,7 +336,7 @@ void verify_cleanup(JCR *jcr, int TermCode)
    const char *Name;
 
 // Dmsg1(100, "Enter verify_cleanup() TermCod=%d\n", TermCode);
    const char *Name;
 
 // Dmsg1(100, "Enter verify_cleanup() TermCod=%d\n", TermCode);

-   dequeue_messages(jcr);            /* display any queued messages */
+   dequeue_messages(jcr);             /* display any queued messages */

 
    Dmsg3(900, "JobLevel=%c Expected=%u JobFiles=%u\n", jcr->JobLevel,
       jcr->ExpectedFiles, jcr->JobFiles);
 
    Dmsg3(900, "JobLevel=%c Expected=%u JobFiles=%u\n", jcr->JobLevel,
       jcr->ExpectedFiles, jcr->JobFiles);


@@ -361,6 +345,12 @@ void verify_cleanup(JCR *jcr, int TermCode)
       TermCode = JS_ErrorTerminated;
    }
 
       TermCode = JS_ErrorTerminated;
    }
 

+   /* If no files were expected, there can be no error */
+   if (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG &&
+       jcr->ExpectedFiles == 0) {
+      TermCode = JS_Terminated;
+   }
+

    JobId = jcr->jr.JobId;
    set_jcr_job_status(jcr, TermCode);
 
    JobId = jcr->jr.JobId;
    set_jcr_job_status(jcr, TermCode);
 


@@ -370,7 +360,7 @@ void verify_cleanup(JCR *jcr, int TermCode)
       jcr->unlink_bsr = false;
    }
 
       jcr->unlink_bsr = false;
    }
 

-   msg_type = M_INFO;                /* by default INFO message */
+   msg_type = M_INFO;                 /* by default INFO message */

    switch (TermCode) {
    case JS_Terminated:
       term_msg = _("Verify OK");
    switch (TermCode) {
    case JS_Terminated:
       term_msg = _("Verify OK");


@@ -378,7 +368,7 @@ void verify_cleanup(JCR *jcr, int TermCode)
    case JS_FatalError:
    case JS_ErrorTerminated:
       term_msg = _("*** Verify Error ***");
    case JS_FatalError:
    case JS_ErrorTerminated:
       term_msg = _("*** Verify Error ***");

-      msg_type = M_ERROR;         /* Generate error message */
+      msg_type = M_ERROR;          /* Generate error message */

       break;
    case JS_Error:
       term_msg = _("Verify warnings");
       break;
    case JS_Error:
       term_msg = _("Verify warnings");


@@ -406,7 +396,7 @@ void verify_cleanup(JCR *jcr, int TermCode)
    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));
    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 " VERSION " (" LSMDATE "): %s\n"
+      Jmsg(jcr, msg_type, 0, _("Bacula %s (%s): %s\n"

 "  JobId:                  %d\n"
 "  Job:                    %s\n"
 "  FileSet:                %s\n"
 "  JobId:                  %d\n"
 "  Job:                    %s\n"
 "  FileSet:                %s\n"


@@ -422,24 +412,26 @@ void verify_cleanup(JCR *jcr, int TermCode)
 "  FD termination status:  %s\n"
 "  SD termination status:  %s\n"
 "  Termination:            %s\n\n"),
 "  FD termination status:  %s\n"
 "  SD termination status:  %s\n"
 "  Termination:            %s\n\n"),

-        edt,
-        jcr->jr.JobId,
-        jcr->jr.Job,
-        jcr->fileset->hdr.name,
-        level_to_str(jcr->JobLevel),
-        jcr->client->hdr.name,
-        jcr->target_jr.JobId,
-        Name,
-        sdt,
-        edt,
-        edit_uint64_with_commas(jcr->ExpectedFiles, ec1),
-        edit_uint64_with_commas(jcr->JobFiles, ec2),
-        jcr->Errors,
-        fd_term_msg,
-        sd_term_msg,
-        term_msg);
+         VERSION,
+         LSMDATE,
+         edt,
+         jcr->jr.JobId,
+         jcr->jr.Job,
+         jcr->fileset->hdr.name,
+         level_to_str(jcr->JobLevel),
+         jcr->client->hdr.name,
+         jcr->previous_jr.JobId,
+         Name,
+         sdt,
+         edt,
+         edit_uint64_with_commas(jcr->ExpectedFiles, ec1),
+         edit_uint64_with_commas(jcr->JobFiles, ec2),
+         jcr->Errors,
+         fd_term_msg,
+         sd_term_msg,
+         term_msg);

    } else {
    } else {

-      Jmsg(jcr, msg_type, 0, _("Bacula " VERSION " (" LSMDATE "): %s\n"
+      Jmsg(jcr, msg_type, 0, _("Bacula %s (%s): %s\n"

 "  JobId:                  %d\n"
 "  Job:                    %s\n"
 "  FileSet:                %s\n"
 "  JobId:                  %d\n"
 "  Job:                    %s\n"
 "  FileSet:                %s\n"


@@ -453,20 +445,22 @@ void verify_cleanup(JCR *jcr, int TermCode)
 "  Non-fatal FD errors:    %d\n"
 "  FD termination status:  %s\n"
 "  Termination:            %s\n\n"),
 "  Non-fatal FD errors:    %d\n"
 "  FD termination status:  %s\n"
 "  Termination:            %s\n\n"),

-        edt,
-        jcr->jr.JobId,
-        jcr->jr.Job,
-        jcr->fileset->hdr.name,
-        level_to_str(jcr->JobLevel),
-        jcr->client->hdr.name,
-        jcr->target_jr.JobId,
-        Name,
-        sdt,
-        edt,
-        edit_uint64_with_commas(jcr->JobFiles, ec1),
-        jcr->Errors,
-        fd_term_msg,
-        term_msg);
+         VERSION,
+         LSMDATE,
+         edt,
+         jcr->jr.JobId,
+         jcr->jr.Job,
+         jcr->fileset->hdr.name,
+         level_to_str(jcr->JobLevel),
+         jcr->client->hdr.name,
+         jcr->previous_jr.JobId,
+         Name,
+         sdt,
+         edt,
+         edit_uint64_with_commas(jcr->JobFiles, ec1),
+         jcr->Errors,
+         fd_term_msg,
+         term_msg);

    }
    Dmsg0(100, "Leave verify_cleanup()\n");
 }
    }
    Dmsg0(100, "Leave verify_cleanup()\n");
 }


@@ -479,12 +473,12 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId)
    BSOCK   *fd;
    int n, len;
    FILE_DBR fdbr;
    BSOCK   *fd;
    int n, len;
    FILE_DBR fdbr;

-   struct stat statf;                /* file stat */
-   struct stat statc;                /* catalog stat */
+   struct stat statf;                 /* file stat */
+   struct stat statc;                 /* catalog stat */

    int stat = JS_Terminated;
    char buf[MAXSTRING];
    POOLMEM *fname = get_pool_memory(PM_MESSAGE);
    int stat = JS_Terminated;
    char buf[MAXSTRING];
    POOLMEM *fname = get_pool_memory(PM_MESSAGE);

-   int do_SIG = NO_SIG;
+   int do_Digest = CRYPTO_DIGEST_NONE;

    int32_t file_index = 0;
 
    memset(&fdbr, 0, sizeof(FILE_DBR));
    int32_t file_index = 0;
 
    memset(&fdbr, 0, sizeof(FILE_DBR));


@@ -496,232 +490,232 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId)
    /*
     * Get Attributes and Signature from File daemon
     * We expect:
    /*
     * Get Attributes and Signature from File daemon
     * We expect:

-    *  FileIndex
-    *  Stream
-    *  Options or SIG (MD5/SHA1)
-    *  Filename
-    *  Attributes
-    *  Link name  ???
+    *   FileIndex
+    *   Stream
+    *   Options or Digest (MD5/SHA1)
+    *   Filename
+    *   Attributes
+    *   Link name  ???

     */
    while ((n=bget_dirmsg(fd)) >= 0 && !job_canceled(jcr)) {
       int stream;
       char *attr, *p, *fn;
     */
    while ((n=bget_dirmsg(fd)) >= 0 && !job_canceled(jcr)) {
       int stream;
       char *attr, *p, *fn;

-      char Opts_SIG[MAXSTRING];        /* Verify Opts or MD5/SHA1 signature */
+      char Opts_Digest[MAXSTRING];        /* Verify Opts or MD5/SHA1 digest */

 
       fname = check_pool_memory_size(fname, fd->msglen);
       jcr->fname = check_pool_memory_size(jcr->fname, fd->msglen);
 
       fname = check_pool_memory_size(fname, fd->msglen);
       jcr->fname = check_pool_memory_size(jcr->fname, fd->msglen);

-      Dmsg1(200, "Atts+SIG=%s\n", fd->msg);
+      Dmsg1(200, "Atts+Digest=%s\n", fd->msg);

       if ((len = sscanf(fd->msg, "%ld %d %100s", &file_index, &stream,
       if ((len = sscanf(fd->msg, "%ld %d %100s", &file_index, &stream,

-           fname)) != 3) {
+            fname)) != 3) {

          Jmsg3(jcr, M_FATAL, 0, _("bird<filed: bad attributes, expected 3 fields got %d\n"
 " mslen=%d msg=%s\n"), len, fd->msglen, fd->msg);
          Jmsg3(jcr, M_FATAL, 0, _("bird<filed: bad attributes, expected 3 fields got %d\n"
 " mslen=%d msg=%s\n"), len, fd->msglen, fd->msg);

-        return false;
+         return false;

       }
       /*
        * We read the Options or Signature into fname
        *  to prevent overrun, now copy it to proper location.
        */
       }
       /*
        * We read the Options or Signature into fname
        *  to prevent overrun, now copy it to proper location.
        */

-      bstrncpy(Opts_SIG, fname, sizeof(Opts_SIG));
+      bstrncpy(Opts_Digest, fname, sizeof(Opts_Digest));

       p = fd->msg;
       p = fd->msg;

-      skip_nonspaces(&p);            /* skip FileIndex */
+      skip_nonspaces(&p);             /* skip FileIndex */

       skip_spaces(&p);
       skip_spaces(&p);

-      skip_nonspaces(&p);            /* skip Stream */
+      skip_nonspaces(&p);             /* skip Stream */

       skip_spaces(&p);
       skip_spaces(&p);

-      skip_nonspaces(&p);            /* skip Opts_SIG */
-      p++;                           /* skip space */
+      skip_nonspaces(&p);             /* skip Opts_Digest */
+      p++;                            /* skip space */

       fn = fname;
       while (*p != 0) {
       fn = fname;
       while (*p != 0) {

-        *fn++ = *p++;                /* copy filename */
+         *fn++ = *p++;                /* copy filename */

       }
       }

-      *fn = *p++;                    /* term filename and point to attribs */
+      *fn = *p++;                     /* term filename and point to attribs */

       attr = p;
       /*
        * Got attributes stream, decode it
        */
       if (stream == STREAM_UNIX_ATTRIBUTES || stream == STREAM_UNIX_ATTRIBUTES_EX) {
       attr = p;
       /*
        * Got attributes stream, decode it
        */
       if (stream == STREAM_UNIX_ATTRIBUTES || stream == STREAM_UNIX_ATTRIBUTES_EX) {

-        int32_t LinkFIf, LinkFIc;
+         int32_t LinkFIf, LinkFIc;

          Dmsg2(400, "file_index=%d attr=%s\n", file_index, attr);
          Dmsg2(400, "file_index=%d attr=%s\n", file_index, attr);

-        jcr->JobFiles++;
-        jcr->FileIndex = file_index;    /* remember attribute file_index */
-        decode_stat(attr, &statf, &LinkFIf);  /* decode file stat packet */
-        do_SIG = NO_SIG;
-        jcr->fn_printed = false;
-        pm_strcpy(jcr->fname, fname);  /* move filename into JCR */
+         jcr->JobFiles++;
+         jcr->FileIndex = file_index;    /* remember attribute file_index */
+         decode_stat(attr, &statf, &LinkFIf);  /* decode file stat packet */
+         do_Digest = CRYPTO_DIGEST_NONE;
+         jcr->fn_printed = false;
+         pm_strcpy(jcr->fname, fname);  /* move filename into JCR */

 
          Dmsg2(040, "dird<filed: stream=%d %s\n", stream, jcr->fname);
          Dmsg1(020, "dird<filed: attr=%s\n", attr);
 
 
          Dmsg2(040, "dird<filed: stream=%d %s\n", stream, jcr->fname);
          Dmsg1(020, "dird<filed: attr=%s\n", attr);
 

-        /*
-         * Find equivalent record in the database
-         */
-        fdbr.FileId = 0;
-        if (!db_get_file_attributes_record(jcr, jcr->db, jcr->fname,
-             &jcr->target_jr, &fdbr)) {
+         /*
+          * Find equivalent record in the database
+          */
+         fdbr.FileId = 0;
+         if (!db_get_file_attributes_record(jcr, jcr->db, jcr->fname,
+              &jcr->previous_jr, &fdbr)) {

             Jmsg(jcr, M_INFO, 0, _("New file: %s\n"), jcr->fname);
             Dmsg1(020, _("File not in catalog: %s\n"), jcr->fname);
             Jmsg(jcr, M_INFO, 0, _("New file: %s\n"), jcr->fname);
             Dmsg1(020, _("File not in catalog: %s\n"), jcr->fname);

-           stat = JS_Differences;
-           continue;
-        } else {
-           /*
-            * mark file record as visited by stuffing the
-            * current JobId, which is unique, into the MarkId field.
-            */
-           db_mark_file_record(jcr, jcr->db, fdbr.FileId, jcr->JobId);
-        }
+            stat = JS_Differences;
+            continue;
+         } else {
+            /*
+             * mark file record as visited by stuffing the
+             * current JobId, which is unique, into the MarkId field.
+             */
+            db_mark_file_record(jcr, jcr->db, fdbr.FileId, jcr->JobId);
+         }

 
          Dmsg3(400, "Found %s in catalog. inx=%d Opts=%s\n", jcr->fname,
 
          Dmsg3(400, "Found %s in catalog. inx=%d Opts=%s\n", jcr->fname,

-           file_index, Opts_SIG);
-        decode_stat(fdbr.LStat, &statc, &LinkFIc); /* decode catalog stat */
-        /*
-         * Loop over options supplied by user and verify the
-         * fields he requests.
-         */
-        for (p=Opts_SIG; *p; p++) {
-           char ed1[30], ed2[30];
-           switch (*p) {
+            file_index, Opts_Digest);
+         decode_stat(fdbr.LStat, &statc, &LinkFIc); /* decode catalog stat */
+         /*
+          * Loop over options supplied by user and verify the
+          * fields he requests.
+          */
+         for (p=Opts_Digest; *p; p++) {
+            char ed1[30], ed2[30];
+            switch (*p) {

             case 'i':                /* compare INODEs */
             case 'i':                /* compare INODEs */

-              if (statc.st_ino != statf.st_ino) {
-                 prt_fname(jcr);
+               if (statc.st_ino != statf.st_ino) {
+                  prt_fname(jcr);

                   Jmsg(jcr, M_INFO, 0, _("      st_ino   differ. Cat: %s File: %s\n"),
                   Jmsg(jcr, M_INFO, 0, _("      st_ino   differ. Cat: %s File: %s\n"),

-                    edit_uint64((uint64_t)statc.st_ino, ed1),
-                    edit_uint64((uint64_t)statf.st_ino, ed2));
-                 stat = JS_Differences;
-              }
-              break;
+                     edit_uint64((uint64_t)statc.st_ino, ed1),
+                     edit_uint64((uint64_t)statf.st_ino, ed2));
+                  stat = JS_Differences;
+               }
+               break;

             case 'p':                /* permissions bits */
             case 'p':                /* permissions bits */

-              if (statc.st_mode != statf.st_mode) {
-                 prt_fname(jcr);
+               if (statc.st_mode != statf.st_mode) {
+                  prt_fname(jcr);

                   Jmsg(jcr, M_INFO, 0, _("      st_mode  differ. Cat: %x File: %x\n"),
                   Jmsg(jcr, M_INFO, 0, _("      st_mode  differ. Cat: %x File: %x\n"),

-                    (uint32_t)statc.st_mode, (uint32_t)statf.st_mode);
-                 stat = JS_Differences;
-              }
-              break;
+                     (uint32_t)statc.st_mode, (uint32_t)statf.st_mode);
+                  stat = JS_Differences;
+               }
+               break;

             case 'n':                /* number of links */
             case 'n':                /* number of links */

-              if (statc.st_nlink != statf.st_nlink) {
-                 prt_fname(jcr);
+               if (statc.st_nlink != statf.st_nlink) {
+                  prt_fname(jcr);

                   Jmsg(jcr, M_INFO, 0, _("      st_nlink differ. Cat: %d File: %d\n"),
                   Jmsg(jcr, M_INFO, 0, _("      st_nlink differ. Cat: %d File: %d\n"),

-                    (uint32_t)statc.st_nlink, (uint32_t)statf.st_nlink);
-                 stat = JS_Differences;
-              }
-              break;
+                     (uint32_t)statc.st_nlink, (uint32_t)statf.st_nlink);
+                  stat = JS_Differences;
+               }
+               break;

             case 'u':                /* user id */
             case 'u':                /* user id */

-              if (statc.st_uid != statf.st_uid) {
-                 prt_fname(jcr);
+               if (statc.st_uid != statf.st_uid) {
+                  prt_fname(jcr);

                   Jmsg(jcr, M_INFO, 0, _("      st_uid   differ. Cat: %u File: %u\n"),
                   Jmsg(jcr, M_INFO, 0, _("      st_uid   differ. Cat: %u File: %u\n"),

-                    (uint32_t)statc.st_uid, (uint32_t)statf.st_uid);
-                 stat = JS_Differences;
-              }
-              break;
+                     (uint32_t)statc.st_uid, (uint32_t)statf.st_uid);
+                  stat = JS_Differences;
+               }
+               break;

             case 'g':                /* group id */
             case 'g':                /* group id */

-              if (statc.st_gid != statf.st_gid) {
-                 prt_fname(jcr);
+               if (statc.st_gid != statf.st_gid) {
+                  prt_fname(jcr);

                   Jmsg(jcr, M_INFO, 0, _("      st_gid   differ. Cat: %u File: %u\n"),
                   Jmsg(jcr, M_INFO, 0, _("      st_gid   differ. Cat: %u File: %u\n"),

-                    (uint32_t)statc.st_gid, (uint32_t)statf.st_gid);
-                 stat = JS_Differences;
-              }
-              break;
+                     (uint32_t)statc.st_gid, (uint32_t)statf.st_gid);
+                  stat = JS_Differences;
+               }
+               break;

             case 's':                /* size */
             case 's':                /* size */

-              if (statc.st_size != statf.st_size) {
-                 prt_fname(jcr);
+               if (statc.st_size != statf.st_size) {
+                  prt_fname(jcr);

                   Jmsg(jcr, M_INFO, 0, _("      st_size  differ. Cat: %s File: %s\n"),
                   Jmsg(jcr, M_INFO, 0, _("      st_size  differ. Cat: %s File: %s\n"),

-                    edit_uint64((uint64_t)statc.st_size, ed1),
-                    edit_uint64((uint64_t)statf.st_size, ed2));
-                 stat = JS_Differences;
-              }
-              break;
+                     edit_uint64((uint64_t)statc.st_size, ed1),
+                     edit_uint64((uint64_t)statf.st_size, ed2));
+                  stat = JS_Differences;
+               }
+               break;

             case 'a':                /* access time */
             case 'a':                /* access time */

-              if (statc.st_atime != statf.st_atime) {
-                 prt_fname(jcr);
+               if (statc.st_atime != statf.st_atime) {
+                  prt_fname(jcr);

                   Jmsg(jcr, M_INFO, 0, _("      st_atime differs\n"));
                   Jmsg(jcr, M_INFO, 0, _("      st_atime differs\n"));

-                 stat = JS_Differences;
-              }
-              break;
+                  stat = JS_Differences;
+               }
+               break;

             case 'm':
             case 'm':

-              if (statc.st_mtime != statf.st_mtime) {
-                 prt_fname(jcr);
+               if (statc.st_mtime != statf.st_mtime) {
+                  prt_fname(jcr);

                   Jmsg(jcr, M_INFO, 0, _("      st_mtime differs\n"));
                   Jmsg(jcr, M_INFO, 0, _("      st_mtime differs\n"));

-                 stat = JS_Differences;
-              }
-              break;
+                  stat = JS_Differences;
+               }
+               break;

             case 'c':                /* ctime */
             case 'c':                /* ctime */

-              if (statc.st_ctime != statf.st_ctime) {
-                 prt_fname(jcr);
+               if (statc.st_ctime != statf.st_ctime) {
+                  prt_fname(jcr);

                   Jmsg(jcr, M_INFO, 0, _("      st_ctime differs\n"));
                   Jmsg(jcr, M_INFO, 0, _("      st_ctime differs\n"));

-                 stat = JS_Differences;
-              }
-              break;
+                  stat = JS_Differences;
+               }
+               break;

             case 'd':                /* file size decrease */
             case 'd':                /* file size decrease */

-              if (statc.st_size > statf.st_size) {
-                 prt_fname(jcr);
+               if (statc.st_size > statf.st_size) {
+                  prt_fname(jcr);

                   Jmsg(jcr, M_INFO, 0, _("      st_size  decrease. Cat: %s File: %s\n"),
                   Jmsg(jcr, M_INFO, 0, _("      st_size  decrease. Cat: %s File: %s\n"),

-                    edit_uint64((uint64_t)statc.st_size, ed1),
-                    edit_uint64((uint64_t)statf.st_size, ed2));
-                 stat = JS_Differences;
-              }
-              break;
+                     edit_uint64((uint64_t)statc.st_size, ed1),
+                     edit_uint64((uint64_t)statf.st_size, ed2));
+                  stat = JS_Differences;
+               }
+               break;

             case '5':                /* compare MD5 */
                Dmsg1(500, "set Do_MD5 for %s\n", jcr->fname);
             case '5':                /* compare MD5 */
                Dmsg1(500, "set Do_MD5 for %s\n", jcr->fname);

-              do_SIG = MD5_SIG;
-              break;
+               do_Digest = CRYPTO_DIGEST_MD5;
+               break;

             case '1':                 /* compare SHA1 */
             case '1':                 /* compare SHA1 */

-              do_SIG = SHA1_SIG;
-              break;
+               do_Digest = CRYPTO_DIGEST_SHA1;
+               break;

             case ':':
             case 'V':
             case ':':
             case 'V':

-           default:
-              break;
-           }
-        }
+            default:
+               break;
+            }
+         }

       /*
       /*

-       * Got SIG Signature from Storage daemon
-       *  It came across in the Opts_SIG field.
+       * Got Digest Signature from Storage daemon
+       *  It came across in the Opts_Digest field.

        */
        */

-      } else if (stream == STREAM_MD5_SIGNATURE || stream == STREAM_SHA1_SIGNATURE) {
-         Dmsg2(400, "stream=SIG inx=%d SIG=%s\n", file_index, Opts_SIG);
-        /*
-         * When ever we get a signature is MUST have been
-         * preceded by an attributes record, which sets attr_file_index
-         */
-        if (jcr->FileIndex != (uint32_t)file_index) {
+      } else if (crypto_digest_stream_type(stream) != CRYPTO_DIGEST_NONE) {
+         Dmsg2(400, "stream=Digest inx=%d Digest=%s\n", file_index, Opts_Digest);
+         /*
+          * When ever we get a digest is MUST have been
+          * preceded by an attributes record, which sets attr_file_index
+          */
+         if (jcr->FileIndex != (uint32_t)file_index) {

             Jmsg2(jcr, M_FATAL, 0, _("MD5/SHA1 index %d not same as attributes %d\n"),
             Jmsg2(jcr, M_FATAL, 0, _("MD5/SHA1 index %d not same as attributes %d\n"),

-              file_index, jcr->FileIndex);
-           return false;
-        }
-        if (do_SIG) {
-           db_escape_string(buf, Opts_SIG, strlen(Opts_SIG));
-           if (strcmp(buf, fdbr.SIG) != 0) {
-              prt_fname(jcr);
-              if (debug_level >= 10) {
+               file_index, jcr->FileIndex);
+            return false;
+         }
+         if (do_Digest != CRYPTO_DIGEST_NONE) {
+            db_escape_string(buf, Opts_Digest, strlen(Opts_Digest));
+            if (strcmp(buf, fdbr.Digest) != 0) {
+               prt_fname(jcr);
+               if (debug_level >= 10) {

                   Jmsg(jcr, M_INFO, 0, _("      %s not same. File=%s Cat=%s\n"),
                   Jmsg(jcr, M_INFO, 0, _("      %s not same. File=%s Cat=%s\n"),

-                       stream==STREAM_MD5_SIGNATURE?"MD5":"SHA1", buf, fdbr.SIG);
-              } else {
+                       stream_to_ascii(stream), buf, fdbr.Digest);
+               } else {

                   Jmsg(jcr, M_INFO, 0, _("      %s differs.\n"),
                   Jmsg(jcr, M_INFO, 0, _("      %s differs.\n"),

-                       stream==STREAM_MD5_SIGNATURE?"MD5":"SHA1");
-              }
-              stat = JS_Differences;
-           }
-           do_SIG = FALSE;
-        }
+                       stream_to_ascii(stream));
+               }
+               stat = JS_Differences;
+            }
+            do_Digest = CRYPTO_DIGEST_NONE;
+         }

       }
       jcr->JobFiles = file_index;
    }
    if (is_bnet_error(fd)) {
       berrno be;
       Jmsg2(jcr, M_FATAL, 0, _("bdird<filed: bad attributes from filed n=%d : %s\n"),
       }
       jcr->JobFiles = file_index;
    }
    if (is_bnet_error(fd)) {
       berrno be;
       Jmsg2(jcr, M_FATAL, 0, _("bdird<filed: bad attributes from filed n=%d : %s\n"),

-                       n, be.strerror());
+                        n, be.strerror());

       return false;
    }
 
    /* Now find all the files that are missing -- i.e. all files in
       return false;
    }
 
    /* Now find all the files that are missing -- i.e. all files in

-    *  the database where the MarkedId != current JobId
+    *  the database where the MarkId != current JobId

     */
    jcr->fn_printed = false;
    bsnprintf(buf, sizeof(buf),
     */
    jcr->fn_printed = false;
    bsnprintf(buf, sizeof(buf),

-"SELECT Path.Path,Filename.Name FROM File,Path,Filename "
-"WHERE File.JobId=%d "
-"AND File.MarkedId!=%d AND File.PathId=Path.PathId "
-"AND File.FilenameId=Filename.FilenameId",
-      JobId, jcr->JobId);
+      "SELECT Path.Path,Filename.Name FROM File,Path,Filename "
+      "WHERE File.JobId=%d "
+      "AND File.MarkId!=%d AND File.PathId=Path.PathId "
+      "AND File.FilenameId=Filename.FilenameId",
+         JobId, jcr->JobId);

    /* missing_handler is called for each file found */
    db_sql_query(jcr->db, buf, missing_handler, (void *)jcr);
    if (jcr->fn_printed) {
    /* missing_handler is called for each file found */
    db_sql_query(jcr->db, buf, missing_handler, (void *)jcr);
    if (jcr->fn_printed) {