X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fbscan.c;h=735ddc11c9d7768d396ec679976973afa2683bc9;hb=95a7bca090bf3430d82effe6f42db505c2b16cf0;hp=3507ab4a177c9e7619035965c48072ba278cb131;hpb=ff92e18b30ae277248deea0cb400b7d7e1cdc9e1;p=bacula%2Fbacula

diff --git a/bacula/src/stored/bscan.c b/bacula/src/stored/bscan.c
index 3507ab4a17..735ddc11c9 100644
--- a/bacula/src/stored/bscan.c
+++ b/bacula/src/stored/bscan.c
@@ -10,22 +10,17 @@
  *   Version $Id$
  */
 /*
-   Copyright (C) 2001-2005 Kern Sibbald
+   Copyright (C) 2001-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 as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   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,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
@@ -33,39 +28,33 @@
 #include "stored.h"
 #include "findlib/find.h"
 #include "cats/cats.h"
+ 
+/* Dummy functions */
+int generate_daemon_event(JCR *jcr, const char *event) { return 1; }
 
 /* Forward referenced functions */
 static void do_scan(void);
 static bool record_cb(DCR *dcr, DEV_RECORD *rec);
 static int  create_file_attributes_record(B_DB *db, JCR *mjcr,
-			       char *fname, char *lname, int type,
-			       char *ap, DEV_RECORD *rec);
+                               char *fname, char *lname, int type,
+                               char *ap, DEV_RECORD *rec);
 static int  create_media_record(B_DB *db, MEDIA_DBR *mr, VOLUME_LABEL *vl);
 static bool update_media_record(B_DB *db, MEDIA_DBR *mr);
 static int  create_pool_record(B_DB *db, POOL_DBR *pr);
 static JCR *create_job_record(B_DB *db, JOB_DBR *mr, SESSION_LABEL *label, DEV_RECORD *rec);
 static int  update_job_record(B_DB *db, JOB_DBR *mr, SESSION_LABEL *elabel,
-			      DEV_RECORD *rec);
+                              DEV_RECORD *rec);
 static int  create_client_record(B_DB *db, CLIENT_DBR *cr);
 static int  create_fileset_record(B_DB *db, FILESET_DBR *fsr);
 static int  create_jobmedia_record(B_DB *db, JCR *jcr);
 static JCR *create_jcr(JOB_DBR *jr, DEV_RECORD *rec, uint32_t JobId);
-static int update_SIG_record(B_DB *db, char *SIGbuf, DEV_RECORD *rec, int type);
-
-
-/* Global variables */
-STORES *me;
-#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
-int win32_client = 1;
-#else
-int win32_client = 0;
-#endif
+static int update_digest_record(B_DB *db, char *digest, DEV_RECORD *rec, int type);
 
 
 /* Local variables */
 static DEVICE *dev = NULL;
 static B_DB *db;
-static JCR *bjcr;		      /* jcr for bscan */
+static JCR *bjcr;                     /* jcr for bscan */
 static BSR *bsr = NULL;
 static MEDIA_DBR mr;
 static POOL_DBR pr;
@@ -99,15 +88,18 @@ static int num_media = 0;
 static int num_files = 0;
 
 #define CONFIG_FILE "bacula-sd.conf"
-char *configfile;
-bool forge_on = false;
+char *configfile = NULL;
+STORES *me = NULL;                    /* our Global resource */
+bool forge_on = false;                /* proceed inspite of I/O errors */
+pthread_mutex_t device_release_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_cond_t wait_device_release = PTHREAD_COND_INITIALIZER;
 
 
 static void usage()
 {
    fprintf(stderr, _(
-"Copyright (C) 2001-2005 Kern Sibbald.\n"
-"\nVersion: " VERSION " (" BDATE ")\n\n"
+"Copyright (C) 2001-%s Kern Sibbald.\n"
+"\nVersion: %s (%s)\n\n"
 "Usage: bscan [ options ] <bacula-archive>\n"
 "       -b bootstrap      specify a bootstrap file\n"
 "       -c <file>         specify configuration file\n"
@@ -124,7 +116,7 @@ static void usage()
 "       -v                verbose\n"
 "       -V <Volumes>      specify Volume names (separated by |)\n"
 "       -w <dir>          specify working directory (default from conf file)\n"
-"       -?                print this message\n\n"));
+"       -?                print this message\n\n"), BYEAR, VERSION, BDATE);
    exit(1);
 }
 
@@ -134,6 +126,10 @@ int main (int argc, char *argv[])
    struct stat stat_buf;
    char *VolumeName = NULL;
 
+   setlocale(LC_ALL, "");
+   bindtextdomain("bacula", LOCALEDIR);
+   textdomain("bacula");
+
    my_name_is(argc, argv, "bscan");
    init_msg(NULL, NULL);
 
@@ -141,72 +137,72 @@ int main (int argc, char *argv[])
    while ((ch = getopt(argc, argv, "b:c:d:h:mn:pP:rsSu:vV:w:?")) != -1) {
       switch (ch) {
       case 'S' :
-	 showProgress = true;
-	 break;
+         showProgress = true;
+         break;
       case 'b':
-	 bsr = parse_bsr(NULL, optarg);
-	 break;
+         bsr = parse_bsr(NULL, optarg);
+         break;
 
       case 'c':                    /* specify config file */
-	 if (configfile != NULL) {
-	    free(configfile);
-	 }
-	 configfile = bstrdup(optarg);
-	 break;
+         if (configfile != NULL) {
+            free(configfile);
+         }
+         configfile = bstrdup(optarg);
+         break;
 
       case 'd':                    /* debug level */
-	 debug_level = atoi(optarg);
-	 if (debug_level <= 0)
-	    debug_level = 1;
-	 break;
+         debug_level = atoi(optarg);
+         if (debug_level <= 0)
+            debug_level = 1;
+         break;
 
       case 'h':
-	 db_host = optarg;
-	 break;
+         db_host = optarg;
+         break;
 
       case 'm':
-	 update_vol_info = true;
-	 break;
+         update_vol_info = true;
+         break;
 
       case 'n':
-	 db_name = optarg;
-	 break;
+         db_name = optarg;
+         break;
 
       case 'u':
-	 db_user = optarg;
-	 break;
+         db_user = optarg;
+         break;
 
       case 'P':
-	 db_password = optarg;
-	 break;
+         db_password = optarg;
+         break;
 
       case 'p':
-	 forge_on = true;
-	 break;
+         forge_on = true;
+         break;
 
       case 'r':
-	 list_records = true;
-	 break;
+         list_records = true;
+         break;
 
       case 's':
-	 update_db = true;
-	 break;
+         update_db = true;
+         break;
 
       case 'v':
-	 verbose++;
-	 break;
+         verbose++;
+         break;
 
       case 'V':                    /* Volume name */
-	 VolumeName = optarg;
-	 break;
+         VolumeName = optarg;
+         break;
 
       case 'w':
-	 wd = optarg;
-	 break;
+         wd = optarg;
+         break;
 
       case '?':
       default:
-	 usage();
+         usage();
 
       }
    }
@@ -228,7 +224,7 @@ int main (int argc, char *argv[])
    if (!me) {
       UnlockRes();
       Emsg1(M_ERROR_TERM, 0, _("No Storage resource defined in %s. Cannot continue.\n"),
-	 configfile);
+         configfile);
    }
    UnlockRes();
    /* Check if -w option given, otherwise use resource for working directory */
@@ -236,7 +232,7 @@ int main (int argc, char *argv[])
       working_directory = wd;
    } else if (!me->working_directory) {
       Emsg1(M_ERROR_TERM, 0, _("No Working Directory defined in %s. Cannot continue.\n"),
-	 configfile);
+         configfile);
    } else {
       working_directory = me->working_directory;
    }
@@ -244,29 +240,29 @@ int main (int argc, char *argv[])
    /* Check that working directory is good */
    if (stat(working_directory, &stat_buf) != 0) {
       Emsg1(M_ERROR_TERM, 0, _("Working Directory: %s not found. Cannot continue.\n"),
-	 working_directory);
+         working_directory);
    }
    if (!S_ISDIR(stat_buf.st_mode)) {
       Emsg1(M_ERROR_TERM, 0, _("Working Directory: %s is not a directory. Cannot continue.\n"),
-	 working_directory);
+         working_directory);
    }
 
    bjcr = setup_jcr("bscan", argv[0], bsr, VolumeName, 1); /* read device */
    if (!bjcr) {
       exit(1);
    }
-   dev = bjcr->dcr->dev;
+   dev = bjcr->read_dcr->dev;
    if (showProgress) {
       char ed1[50];
       struct stat sb;
       fstat(dev->fd, &sb);
       currentVolumeSize = sb.st_size;
       Pmsg1(000, _("First Volume Size = %sn"), 
-	 edit_uint64(currentVolumeSize, ed1));
+         edit_uint64(currentVolumeSize, ed1));
    }
 
    if ((db=db_init_database(NULL, db_name, db_user, db_password,
-	db_host, 0, NULL, 0)) == NULL) {
+        db_host, 0, NULL, 0)) == NULL) {
       Emsg0(M_ERROR_TERM, 0, _("Could not init Bacula database\n"));
    }
    if (!db_open_database(NULL, db)) {
@@ -278,12 +274,17 @@ int main (int argc, char *argv[])
    }
 
    do_scan();
-   printf("Records %sadded or updated in the catalog:\n%7d Media\n%7d Pool\n%7d Job\n%7d File\n",
-      update_db?"":"would have been ",
-      num_media, num_pools, num_jobs, num_files);
+   if (update_db) {
+      printf("Records added or updated in the catalog:\n%7d Media\n%7d Pool\n%7d Job\n%7d File\n",
+         num_media, num_pools, num_jobs, num_files);
+   }
+   else {
+      printf("Records would have been added or updated in the catalog:\n%7d Media\n%7d Pool\n%7d Job\n%7d File\n",
+         num_media, num_pools, num_jobs, num_files);
+   }
 
    free_jcr(bjcr);
-   term_dev(dev);
+   dev->term();
    return 0;
 }
 
@@ -300,21 +301,22 @@ static bool bscan_mount_next_read_volume(DCR *dcr)
    foreach_dlist(mdcr, dev->attached_dcrs) {
       JCR *mjcr = mdcr->jcr;
       if (mjcr->JobId == 0) {
-	 continue;
+         continue;
       }
       if (verbose) {
          Pmsg1(000, _("Create JobMedia for Job %s\n"), mjcr->Job);
       }
-      if (dev->state & ST_TAPE) {
-	 mdcr->EndBlock = dev->EndBlock;
-	 mdcr->EndFile = dev->EndFile;
-      } else {
-	 mdcr->EndBlock = (uint32_t)dev->file_addr;
-	 mdcr->EndFile = (uint32_t)(dev->file_addr >> 32);
+      if (dev->is_tape()) {
+         mdcr->EndBlock = dcr->EndBlock;
+         mdcr->EndFile = dcr->EndFile;
+//    } else {
+//       mdcr->EndBlock = (uint32_t)dcr->file_addr;
+//       mdcr->EndFile = (uint32_t)(dcr->file_addr >> 32);
       }
+      mjcr->read_dcr->VolLastIndex = dcr->VolLastIndex;
       if (!create_jobmedia_record(db, mjcr)) {
          Pmsg2(000, _("Could not create JobMedia record for Volume=%s Job=%s\n"),
-	    dev->VolCatInfo.VolCatName, mjcr->Job);
+            dev->VolCatInfo.VolCatName, mjcr->Job);
       }
    }
    /* Now let common read routine get up next tape. Note,
@@ -329,7 +331,7 @@ static bool bscan_mount_next_read_volume(DCR *dcr)
       fstat(dev->fd, &sb);
       currentVolumeSize = sb.st_size;
       Pmsg1(000, _("First Volume Size = %sn"), 
-	 edit_uint64(currentVolumeSize, ed1));
+         edit_uint64(currentVolumeSize, ed1));
    }
    return stat;
 }
@@ -347,14 +349,14 @@ static void do_scan()
 
    /* Detach bscan's jcr as we are not a real Job on the tape */
 
-   read_records(bjcr->dcr, record_cb, bscan_mount_next_read_volume);
+   read_records(bjcr->read_dcr, record_cb, bscan_mount_next_read_volume);
 
    free_attr(attr);
 }
 
 /*
  * Returns: true  if OK
- *	    false if error
+ *          false if error
  */
 static bool record_cb(DCR *dcr, DEV_RECORD *rec)
 {
@@ -363,23 +365,24 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
    DEVICE *dev = dcr->dev;
    JCR *bjcr = dcr->jcr;
    DEV_BLOCK *block = dcr->block;
+   char digest[BASE64_SIZE(CRYPTO_DIGEST_MAX_SIZE)];
 
    if (rec->data_len > 0) {
       mr.VolBytes += rec->data_len + WRITE_RECHDR_LENGTH; /* Accumulate Volume bytes */
-      if (showProgress) {
-	 int pct = (mr.VolBytes * 100) / currentVolumeSize;
-	 if (pct != last_pct) {
-            fprintf(stdout, "done: %d%%\n", pct);
-	    fflush(stdout);
-	    last_pct = pct;
-	 }
+      if (showProgress && currentVolumeSize > 0) {
+         int pct = (mr.VolBytes * 100) / currentVolumeSize;
+         if (pct != last_pct) {
+            fprintf(stdout, _("done: %d%%\n"), pct);
+            fflush(stdout);
+            last_pct = pct;
+         }
       }
    }
 
    if (list_records) {
       Pmsg5(000, _("Record: SessId=%u SessTim=%u FileIndex=%d Stream=%d len=%u\n"),
-	    rec->VolSessionId, rec->VolSessionTime, rec->FileIndex,
-	    rec->Stream, rec->data_len);
+            rec->VolSessionId, rec->VolSessionTime, rec->FileIndex,
+            rec->Stream, rec->data_len);
    }
    /*
     * Check for Start or End of Session Record
@@ -389,223 +392,226 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
       bool save_update_db = update_db;
 
       if (verbose > 1) {
-	 dump_label_record(dev, rec, 1);
+         dump_label_record(dev, rec, 1);
       }
       switch (rec->FileIndex) {
       case PRE_LABEL:
          Pmsg0(000, _("Volume is prelabeled. This tape cannot be scanned.\n"));
-	 return false;
-	 break;
+         return false;
+         break;
 
       case VOL_LABEL:
-	 unser_volume_label(dev, rec);
-	 /* Check Pool info */
-	 bstrncpy(pr.Name, dev->VolHdr.PoolName, sizeof(pr.Name));
-	 bstrncpy(pr.PoolType, dev->VolHdr.PoolType, sizeof(pr.PoolType));
-	 num_pools++;
-	 if (db_get_pool_record(bjcr, db, &pr)) {
-	    if (verbose) {
+         unser_volume_label(dev, rec);
+         /* Check Pool info */
+         bstrncpy(pr.Name, dev->VolHdr.PoolName, sizeof(pr.Name));
+         bstrncpy(pr.PoolType, dev->VolHdr.PoolType, sizeof(pr.PoolType));
+         num_pools++;
+         if (db_get_pool_record(bjcr, db, &pr)) {
+            if (verbose) {
                Pmsg1(000, _("Pool record for %s found in DB.\n"), pr.Name);
-	    }
-	 } else {
-	    if (!update_db) {
+            }
+         } else {
+            if (!update_db) {
                Pmsg1(000, _("VOL_LABEL: Pool record not found for Pool: %s\n"),
-		  pr.Name);
-	    }
-	    create_pool_record(db, &pr);
-	 }
-	 if (strcmp(pr.PoolType, dev->VolHdr.PoolType) != 0) {
+                  pr.Name);
+            }
+            create_pool_record(db, &pr);
+         }
+         if (strcmp(pr.PoolType, dev->VolHdr.PoolType) != 0) {
             Pmsg2(000, _("VOL_LABEL: PoolType mismatch. DB=%s Vol=%s\n"),
-	       pr.PoolType, dev->VolHdr.PoolType);
-	    return true;
-	 } else if (verbose) {
+               pr.PoolType, dev->VolHdr.PoolType);
+            return true;
+         } else if (verbose) {
             Pmsg1(000, _("Pool type \"%s\" is OK.\n"), pr.PoolType);
-	 }
-
-	 /* Check Media Info */
-	 memset(&mr, 0, sizeof(mr));
-	 bstrncpy(mr.VolumeName, dev->VolHdr.VolName, sizeof(mr.VolumeName));
-	 mr.PoolId = pr.PoolId;
-	 num_media++;
-	 if (db_get_media_record(bjcr, db, &mr)) {
-	    if (verbose) {
+         }
+
+         /* Check Media Info */
+         memset(&mr, 0, sizeof(mr));
+         bstrncpy(mr.VolumeName, dev->VolHdr.VolumeName, sizeof(mr.VolumeName));
+         mr.PoolId = pr.PoolId;
+         num_media++;
+         if (db_get_media_record(bjcr, db, &mr)) {
+            if (verbose) {
                Pmsg1(000, _("Media record for %s found in DB.\n"), mr.VolumeName);
-	    }
-	    /* Clear out some volume statistics that will be updated */
-	    mr.VolJobs = mr.VolFiles = mr.VolBlocks = 0;
-	    mr.VolBytes = rec->data_len + 20;
-	 } else {
-	    if (!update_db) {
+            }
+            /* Clear out some volume statistics that will be updated */
+            mr.VolJobs = mr.VolFiles = mr.VolBlocks = 0;
+            mr.VolBytes = rec->data_len + 20;
+         } else {
+            if (!update_db) {
                Pmsg1(000, _("VOL_LABEL: Media record not found for Volume: %s\n"),
-		  mr.VolumeName);
-	    }
-	    bstrncpy(mr.MediaType, dev->VolHdr.MediaType, sizeof(mr.MediaType));
-	    create_media_record(db, &mr, &dev->VolHdr);
-	 }
-	 if (strcmp(mr.MediaType, dev->VolHdr.MediaType) != 0) {
+                  mr.VolumeName);
+            }
+            bstrncpy(mr.MediaType, dev->VolHdr.MediaType, sizeof(mr.MediaType));
+            create_media_record(db, &mr, &dev->VolHdr);
+         }
+         if (strcmp(mr.MediaType, dev->VolHdr.MediaType) != 0) {
             Pmsg2(000, _("VOL_LABEL: MediaType mismatch. DB=%s Vol=%s\n"),
-	       mr.MediaType, dev->VolHdr.MediaType);
-	    return true;	      /* ignore error */
-	 } else if (verbose) {
+               mr.MediaType, dev->VolHdr.MediaType);
+            return true;              /* ignore error */
+         } else if (verbose) {
             Pmsg1(000, _("Media type \"%s\" is OK.\n"), mr.MediaType);
-	 }
-	 /* Reset some DCR variables */
-	 foreach_dlist(dcr, dev->attached_dcrs) {
-	    dcr->VolFirstIndex = dcr->FileIndex = 0;
-	    dcr->StartBlock = dcr->EndBlock = 0;
-	    dcr->StartFile = dcr->EndFile = 0;
-	 }
+         }
+         /* Reset some DCR variables */
+         foreach_dlist(dcr, dev->attached_dcrs) {
+            dcr->VolFirstIndex = dcr->FileIndex = 0;
+            dcr->StartBlock = dcr->EndBlock = 0;
+            dcr->StartFile = dcr->EndFile = 0;
+         }
 
          Pmsg1(000, _("VOL_LABEL: OK for Volume: %s\n"), mr.VolumeName);
-	 break;
+         break;
 
       case SOS_LABEL:
-	 mr.VolJobs++;
-	 num_jobs++;
-	 if (ignored_msgs > 0) {
+         mr.VolJobs++;
+         num_jobs++;
+         if (ignored_msgs > 0) {
             Pmsg1(000, _("%d \"errors\" ignored before first Start of Session record.\n"),
-		  ignored_msgs);
-	    ignored_msgs = 0;
-	 }
-	 unser_session_label(&label, rec);
-	 memset(&jr, 0, sizeof(jr));
-	 bstrncpy(jr.Job, label.Job, sizeof(jr.Job));
-	 if (db_get_job_record(bjcr, db, &jr)) {
-	    /* Job record already exists in DB */
+                  ignored_msgs);
+            ignored_msgs = 0;
+         }
+         unser_session_label(&label, rec);
+         memset(&jr, 0, sizeof(jr));
+         bstrncpy(jr.Job, label.Job, sizeof(jr.Job));
+         if (db_get_job_record(bjcr, db, &jr)) {
+            /* Job record already exists in DB */
             update_db = false;  /* don't change db in create_job_record */
-	    if (verbose) {
+            if (verbose) {
                Pmsg1(000, _("SOS_LABEL: Found Job record for JobId: %d\n"), jr.JobId);
-	    }
-	 } else {
-	    /* Must create a Job record in DB */
-	    if (!update_db) {
+            }
+         } else {
+            /* Must create a Job record in DB */
+            if (!update_db) {
                Pmsg1(000, _("SOS_LABEL: Job record not found for JobId: %d\n"),
-		  jr.JobId);
-	    }
-	 }
-	 /* Create Client record if not already there */
-	    bstrncpy(cr.Name, label.ClientName, sizeof(cr.Name));
-	    create_client_record(db, &cr);
-	    jr.ClientId = cr.ClientId;
+                  jr.JobId);
+            }
+         }
+         /* Create Client record if not already there */
+            bstrncpy(cr.Name, label.ClientName, sizeof(cr.Name));
+            create_client_record(db, &cr);
+            jr.ClientId = cr.ClientId;
 
          /* process label, if Job record exists don't update db */
-	 mjcr = create_job_record(db, &jr, &label, rec);
-	 dcr = mjcr->dcr;
-	 update_db = save_update_db;
-
-	 jr.PoolId = pr.PoolId;
-	 /* Set start positions into JCR */
-	 if (dev->state & ST_TAPE) {
-	    /*
-	     * Note, we have already advanced past current block,
-	     *	so the correct number is block_num - 1
-	     */
-	    dcr->StartBlock = dev->block_num - 1;
-	    dcr->StartFile = dev->file;
-	 } else {
-	    dcr->StartBlock = (uint32_t)dev->file_addr;
-	    dcr->StartFile = (uint32_t)(dev->file_addr >> 32);
-	 }
-	 mjcr->start_time = jr.StartTime;
-	 mjcr->JobLevel = jr.JobLevel;
-
-	 mjcr->client_name = get_pool_memory(PM_FNAME);
-	 pm_strcpy(mjcr->client_name, label.ClientName);
-	 mjcr->fileset_name = get_pool_memory(PM_FNAME);
-	 pm_strcpy(mjcr->fileset_name, label.FileSetName);
-	 bstrncpy(dcr->pool_type, label.PoolType, sizeof(dcr->pool_type));
-	 bstrncpy(dcr->pool_name, label.PoolName, sizeof(dcr->pool_name));
-
-	 if (rec->VolSessionId != jr.VolSessionId) {
+         mjcr = create_job_record(db, &jr, &label, rec);
+         dcr = mjcr->read_dcr;
+         update_db = save_update_db;
+
+         jr.PoolId = pr.PoolId;
+#ifdef xxx
+         /* Set start positions into JCR */
+         if (dev->is_tape()) {
+            /*
+             * Note, we have already advanced past current block,
+             *  so the correct number is block_num - 1
+             */
+            dcr->StartBlock = dev->block_num - 1;
+            dcr->StartFile = dev->file;
+         } else {
+            dcr->StartBlock = (uint32_t)dev->file_addr;
+            dcr->StartFile = (uint32_t)(dev->file_addr >> 32);
+         }
+#endif
+         mjcr->start_time = jr.StartTime;
+         mjcr->JobLevel = jr.JobLevel;
+
+         mjcr->client_name = get_pool_memory(PM_FNAME);
+         pm_strcpy(mjcr->client_name, label.ClientName);
+         mjcr->fileset_name = get_pool_memory(PM_FNAME);
+         pm_strcpy(mjcr->fileset_name, label.FileSetName);
+         bstrncpy(dcr->pool_type, label.PoolType, sizeof(dcr->pool_type));
+         bstrncpy(dcr->pool_name, label.PoolName, sizeof(dcr->pool_name));
+
+         if (rec->VolSessionId != jr.VolSessionId) {
             Pmsg3(000, _("SOS_LABEL: VolSessId mismatch for JobId=%u. DB=%d Vol=%d\n"),
-	       jr.JobId,
-	       jr.VolSessionId, rec->VolSessionId);
-	    return true;	      /* ignore error */
-	 }
-	 if (rec->VolSessionTime != jr.VolSessionTime) {
+               jr.JobId,
+               jr.VolSessionId, rec->VolSessionId);
+            return true;              /* ignore error */
+         }
+         if (rec->VolSessionTime != jr.VolSessionTime) {
             Pmsg3(000, _("SOS_LABEL: VolSessTime mismatch for JobId=%u. DB=%d Vol=%d\n"),
-	       jr.JobId,
-	       jr.VolSessionTime, rec->VolSessionTime);
-	    return true;	      /* ignore error */
-	 }
-	 if (jr.PoolId != pr.PoolId) {
+               jr.JobId,
+               jr.VolSessionTime, rec->VolSessionTime);
+            return true;              /* ignore error */
+         }
+         if (jr.PoolId != pr.PoolId) {
             Pmsg3(000, _("SOS_LABEL: PoolId mismatch for JobId=%u. DB=%d Vol=%d\n"),
-	       jr.JobId,
-	       jr.PoolId, pr.PoolId);
-	    return true;	      /* ignore error */
-	 }
-	 break;
+               jr.JobId,
+               jr.PoolId, pr.PoolId);
+            return true;              /* ignore error */
+         }
+         break;
 
       case EOS_LABEL:
-	 unser_session_label(&elabel, rec);
+         unser_session_label(&elabel, rec);
 
-	 /* Create FileSet record */
-	 bstrncpy(fsr.FileSet, label.FileSetName, sizeof(fsr.FileSet));
-	 bstrncpy(fsr.MD5, label.FileSetMD5, sizeof(fsr.MD5));
-	 create_fileset_record(db, &fsr);
-	 jr.FileSetId = fsr.FileSetId;
+         /* Create FileSet record */
+         bstrncpy(fsr.FileSet, label.FileSetName, sizeof(fsr.FileSet));
+         bstrncpy(fsr.MD5, label.FileSetMD5, sizeof(fsr.MD5));
+         create_fileset_record(db, &fsr);
+         jr.FileSetId = fsr.FileSetId;
 
-	 mjcr = get_jcr_by_session(rec->VolSessionId, rec->VolSessionTime);
-	 if (!mjcr) {
+         mjcr = get_jcr_by_session(rec->VolSessionId, rec->VolSessionTime);
+         if (!mjcr) {
             Pmsg2(000, _("Could not find SessId=%d SessTime=%d for EOS record.\n"),
-		  rec->VolSessionId, rec->VolSessionTime);
-	    break;
-	 }
+                  rec->VolSessionId, rec->VolSessionTime);
+            break;
+         }
 
-	 /* Do the final update to the Job record */
-	 update_job_record(db, &jr, &elabel, rec);
+         /* Do the final update to the Job record */
+         update_job_record(db, &jr, &elabel, rec);
 
-	 mjcr->end_time = jr.EndTime;
-	 mjcr->JobStatus = JS_Terminated;
+         mjcr->end_time = jr.EndTime;
+         mjcr->JobStatus = JS_Terminated;
 
-	 /* Create JobMedia record */
-	 create_jobmedia_record(db, mjcr);
-	 dev->attached_dcrs->remove(mjcr->dcr);
-	 free_jcr(mjcr);
+         /* Create JobMedia record */
+         mjcr->read_dcr->VolLastIndex = dcr->VolLastIndex;
+         create_jobmedia_record(db, mjcr);
+         dev->attached_dcrs->remove(mjcr->read_dcr);
+         free_jcr(mjcr);
 
-	 break;
+         break;
 
       case EOM_LABEL:
-	 break;
-
-      case EOT_LABEL:		   /* end of all tapes */
-	 /*
-	  * Wiffle through all jobs still open and close
-	  *   them.
-	  */
-	 if (update_db) {
-	    DCR *mdcr;
-	    foreach_dlist(mdcr, dev->attached_dcrs) {
-	       JCR *mjcr = mdcr->jcr;
-	       if (!mjcr || mjcr->JobId == 0) {
-		  continue;
-	       }
-	       jr.JobId = mjcr->JobId;
-	       /* Mark Job as Error Terimined */
-	       jr.JobStatus = JS_ErrorTerminated;
-	       jr.JobFiles = mjcr->JobFiles;
-	       jr.JobBytes = mjcr->JobBytes;
-	       jr.VolSessionId = mjcr->VolSessionId;
-	       jr.VolSessionTime = mjcr->VolSessionTime;
-	       jr.JobTDate = (utime_t)mjcr->start_time;
-	       jr.ClientId = mjcr->ClientId;
-	       if (!db_update_job_end_record(bjcr, db, &jr)) {
+         break;
+
+      case EOT_LABEL:              /* end of all tapes */
+         /*
+          * Wiffle through all jobs still open and close
+          *   them.
+          */
+         if (update_db) {
+            DCR *mdcr;
+            foreach_dlist(mdcr, dev->attached_dcrs) {
+               JCR *mjcr = mdcr->jcr;
+               if (!mjcr || mjcr->JobId == 0) {
+                  continue;
+               }
+               jr.JobId = mjcr->JobId;
+               /* Mark Job as Error Terimined */
+               jr.JobStatus = JS_ErrorTerminated;
+               jr.JobFiles = mjcr->JobFiles;
+               jr.JobBytes = mjcr->JobBytes;
+               jr.VolSessionId = mjcr->VolSessionId;
+               jr.VolSessionTime = mjcr->VolSessionTime;
+               jr.JobTDate = (utime_t)mjcr->start_time;
+               jr.ClientId = mjcr->ClientId;
+               if (!db_update_job_end_record(bjcr, db, &jr)) {
                   Pmsg1(0, _("Could not update job record. ERR=%s\n"), db_strerror(db));
-	       }
-	       mjcr->dcr = NULL;
-	       free_jcr(mjcr);
-	    }
-	 }
-	 mr.VolFiles = rec->File;
-	 mr.VolBlocks = rec->Block;
-	 mr.VolBytes += mr.VolBlocks * WRITE_BLKHDR_LENGTH; /* approx. */
-	 mr.VolMounts++;
-	 update_media_record(db, &mr);
+               }
+               mjcr->read_dcr = NULL;
+               free_jcr(mjcr);
+            }
+         }
+         mr.VolFiles = rec->File;
+         mr.VolBlocks = rec->Block;
+         mr.VolBytes += mr.VolBlocks * WRITE_BLKHDR_LENGTH; /* approx. */
+         mr.VolMounts++;
+         update_media_record(db, &mr);
          Pmsg3(0, _("End of all Volumes. VolFiles=%u VolBlocks=%u VolBytes=%s\n"), mr.VolFiles,
-		    mr.VolBlocks, edit_uint64_with_commas(mr.VolBytes, ec1));
-	 break;
+                    mr.VolBlocks, edit_uint64_with_commas(mr.VolBytes, ec1));
+         break;
       default:
-	 break;
+         break;
       } /* end switch */
       return true;
    }
@@ -614,13 +620,13 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
    if (!mjcr) {
       if (mr.VolJobs > 0) {
          Pmsg2(000, _("Could not find Job for SessId=%d SessTime=%d record.\n"),
-		      rec->VolSessionId, rec->VolSessionTime);
+                      rec->VolSessionId, rec->VolSessionTime);
       } else {
-	 ignored_msgs++;
+         ignored_msgs++;
       }
       return true;
    }
-   dcr = mjcr->dcr;
+   dcr = mjcr->read_dcr;
    if (dcr->VolFirstIndex == 0) {
       dcr->VolFirstIndex = block->FirstIndex;
    }
@@ -636,27 +642,27 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
 
       if (attr->file_index != rec->FileIndex) {
          Emsg2(M_ERROR_TERM, 0, _("Record header file index %ld not equal record index %ld\n"),
-	    rec->FileIndex, attr->file_index);
+            rec->FileIndex, attr->file_index);
       }
 
       if (verbose > 1) {
-	 decode_stat(attr->attr, &attr->statp, &attr->LinkFI);
-	 build_attr_output_fnames(bjcr, attr);
-	 print_ls_output(bjcr, attr);
+         decode_stat(attr->attr, &attr->statp, &attr->LinkFI);
+         build_attr_output_fnames(bjcr, attr);
+         print_ls_output(bjcr, attr);
       }
       fr.JobId = mjcr->JobId;
       fr.FileId = 0;
       num_files++;
       if (verbose && (num_files & 0x7FFF) == 0) {
-	 char ed1[30], ed2[30], ed3[30], ed4[30];
+         char ed1[30], ed2[30], ed3[30], ed4[30];
          Pmsg4(000, _("%s file records. At file:blk=%s:%s bytes=%s\n"),
-		     edit_uint64_with_commas(num_files, ed1),
-		     edit_uint64_with_commas(rec->File, ed2),
-		     edit_uint64_with_commas(rec->Block, ed3),
-		     edit_uint64_with_commas(mr.VolBytes, ed4));
+                     edit_uint64_with_commas(num_files, ed1),
+                     edit_uint64_with_commas(rec->File, ed2),
+                     edit_uint64_with_commas(rec->Block, ed3),
+                     edit_uint64_with_commas(mr.VolBytes, ed4));
       }
       create_file_attributes_record(db, mjcr, attr->fname, attr->lname,
-	    attr->type, attr->attr, rec);
+            attr->type, attr->attr, rec);
       free_jcr(mjcr);
       break;
 
@@ -664,48 +670,87 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
    case STREAM_WIN32_DATA:
    case STREAM_FILE_DATA:
    case STREAM_SPARSE_DATA:
+   case STREAM_ENCRYPTED_FILE_DATA:
+   case STREAM_ENCRYPTED_WIN32_DATA:
+   case STREAM_ENCRYPTED_MACOS_FORK_DATA:
+      /*
+       * For encrypted stream, this is an approximation.
+       * The data must be decrypted to know the correct length.
+       */
       mjcr->JobBytes += rec->data_len;
       if (rec->Stream == STREAM_SPARSE_DATA) {
-	 mjcr->JobBytes -= sizeof(uint64_t);
+         mjcr->JobBytes -= sizeof(uint64_t);
       }
 
-      free_jcr(mjcr);		      /* done using JCR */
+      free_jcr(mjcr);                 /* done using JCR */
       break;
 
    case STREAM_GZIP_DATA:
-      mjcr->JobBytes += rec->data_len; /* No correct, we should expand it */
-      free_jcr(mjcr);		      /* done using JCR */
+   case STREAM_ENCRYPTED_FILE_GZIP_DATA:
+   case STREAM_ENCRYPTED_WIN32_GZIP_DATA:
+      /* No correct, we should (decrypt and) expand it 
+         done using JCR 
+      */
+      mjcr->JobBytes += rec->data_len;
+      free_jcr(mjcr);                 
       break;
 
    case STREAM_SPARSE_GZIP_DATA:
       mjcr->JobBytes += rec->data_len - sizeof(uint64_t); /* No correct, we should expand it */
-      free_jcr(mjcr);		      /* done using JCR */
+      free_jcr(mjcr);                 /* done using JCR */
       break;
 
    /* Win32 GZIP stream */
    case STREAM_WIN32_GZIP_DATA:
       mjcr->JobBytes += rec->data_len;
-      free_jcr(mjcr);		      /* done using JCR */
+      free_jcr(mjcr);                 /* done using JCR */
+      break;
+
+   case STREAM_MD5_DIGEST:
+      bin_to_base64(digest, sizeof(digest), (char *)rec->data, CRYPTO_DIGEST_MD5_SIZE, true);
+      if (verbose > 1) {
+         Pmsg1(000, _("Got MD5 record: %s\n"), digest);
+      }
+      update_digest_record(db, digest, rec, CRYPTO_DIGEST_MD5);
+      break;
+
+   case STREAM_SHA1_DIGEST:
+      bin_to_base64(digest, sizeof(digest), (char *)rec->data, CRYPTO_DIGEST_SHA1_SIZE, true);
+      if (verbose > 1) {
+         Pmsg1(000, _("Got SHA1 record: %s\n"), digest);
+      }
+      update_digest_record(db, digest, rec, CRYPTO_DIGEST_SHA1);
       break;
 
-   case STREAM_MD5_SIGNATURE:
-      char MD5buf[50];
-      bin_to_base64(MD5buf, (char *)rec->data, 16); /* encode 16 bytes */
+   case STREAM_SHA256_DIGEST:
+      bin_to_base64(digest, sizeof(digest), (char *)rec->data, CRYPTO_DIGEST_SHA256_SIZE, true);
       if (verbose > 1) {
-         Pmsg1(000, _("Got MD5 record: %s\n"), MD5buf);
+         Pmsg1(000, _("Got SHA256 record: %s\n"), digest);
       }
-      update_SIG_record(db, MD5buf, rec, MD5_SIG);
+      update_digest_record(db, digest, rec, CRYPTO_DIGEST_SHA256);
       break;
 
-   case STREAM_SHA1_SIGNATURE:
-      char SIGbuf[50];
-      bin_to_base64(SIGbuf, (char *)rec->data, 20); /* encode 20 bytes */
+   case STREAM_SHA512_DIGEST:
+      bin_to_base64(digest, sizeof(digest), (char *)rec->data, CRYPTO_DIGEST_SHA512_SIZE, true);
       if (verbose > 1) {
-         Pmsg1(000, _("Got SHA1 record: %s\n"), SIGbuf);
+         Pmsg1(000, _("Got SHA512 record: %s\n"), digest);
       }
-      update_SIG_record(db, SIGbuf, rec, SHA1_SIG);
+      update_digest_record(db, digest, rec, CRYPTO_DIGEST_SHA512);
       break;
 
+   case STREAM_ENCRYPTED_SESSION_DATA:
+      // TODO landonf: Investigate crypto support in bscan
+      if (verbose > 1) {
+         Pmsg0(000, _("Got signed digest record\n"));
+      }
+      break;
+
+   case STREAM_SIGNED_DIGEST:
+      // TODO landonf: Investigate crypto support in bscan
+      if (verbose > 1) {
+         Pmsg0(000, _("Got signed digest record\n"));
+      }
+      break;
 
    case STREAM_PROGRAM_NAMES:
       if (verbose) {
@@ -718,8 +763,14 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
          Pmsg0(000, _("Got Prog Data Stream record.\n"));
       }
       break;
+
+   case STREAM_UNIX_ATTRIBUTES_ACCESS_ACL:   /* Standard ACL attributes on UNIX */
+   case STREAM_UNIX_ATTRIBUTES_DEFAULT_ACL:  /* Default ACL attributes on UNIX */
+      /* Ignore Unix attributes */
+      break;
+
    default:
-      Pmsg2(0, _("Unknown stream type!!! stream=%d data=%s\n"), rec->Stream, rec->data);
+      Pmsg2(0, _("Unknown stream type!!! stream=%d len=%i\n"), rec->Stream, rec->data_len);
       break;
    }
    return true;
@@ -732,7 +783,7 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
  */
 static void bscan_free_jcr(JCR *jcr)
 {
-   Dmsg0(200, "Start dird free_jcr\n");
+   Dmsg0(200, "Start bscan free_jcr\n");
 
    if (jcr->file_bsock) {
       Dmsg0(200, "Close File bsock\n");
@@ -749,7 +800,11 @@ static void bscan_free_jcr(JCR *jcr)
       free_dcr(jcr->dcr);
       jcr->dcr = NULL;
    }
-   Dmsg0(200, "End dird free_jcr\n");
+   if (jcr->read_dcr) {
+      free_dcr(jcr->read_dcr);
+      jcr->read_dcr = NULL;
+   }
+   Dmsg0(200, "End bscan free_jcr\n");
 }
 
 /*
@@ -757,10 +812,10 @@ static void bscan_free_jcr(JCR *jcr)
  *   record, and then create the attributes record.
  */
 static int create_file_attributes_record(B_DB *db, JCR *mjcr,
-			       char *fname, char *lname, int type,
-			       char *ap, DEV_RECORD *rec)
+                               char *fname, char *lname, int type,
+                               char *ap, DEV_RECORD *rec)
 {
-   DCR *dcr = mjcr->dcr;
+   DCR *dcr = mjcr->read_dcr;
    ar.fname = fname;
    ar.link = lname;
    ar.ClientId = mjcr->ClientId;
@@ -801,6 +856,7 @@ static int create_media_record(B_DB *db, MEDIA_DBR *mr, VOLUME_LABEL *vl)
    /* We mark Vols as Archive to keep them from being re-written */
    bstrncpy(mr->VolStatus, "Archive", sizeof(mr->VolStatus));
    mr->VolRetention = 365 * 3600 * 24; /* 1 year */
+   mr->Enabled = 1;
    if (vl->VerNum >= 11) {
       mr->FirstWritten = btime_to_utime(vl->write_btime);
       mr->LabelDate    = btime_to_utime(vl->label_btime);
@@ -914,8 +970,8 @@ static int create_fileset_record(B_DB *db, FILESET_DBR *fsr)
    } else {
       if (!db_create_fileset_record(bjcr, db, fsr)) {
          Pmsg2(0, _("Could not create FileSet record \"%s\". ERR=%s\n"),
-	    fsr->FileSet, db_strerror(db));
-	 return 0;
+            fsr->FileSet, db_strerror(db));
+         return 0;
       }
       if (verbose) {
          Pmsg1(000, _("Created FileSet record \"%s\"\n"), fsr->FileSet);
@@ -930,7 +986,7 @@ static int create_fileset_record(B_DB *db, FILESET_DBR *fsr)
  *  begins running.
  */
 static JCR *create_job_record(B_DB *db, JOB_DBR *jr, SESSION_LABEL *label,
-			     DEV_RECORD *rec)
+                             DEV_RECORD *rec)
 {
    JCR *mjcr;
    struct date_time dt;
@@ -975,8 +1031,8 @@ static JCR *create_job_record(B_DB *db, JOB_DBR *jr, SESSION_LABEL *label,
       return mjcr;
    }
    Pmsg2(000, _("Created new JobId=%u record for original JobId=%u\n"), jr->JobId,
-	 label->JobId);
-   mjcr->JobId = jr->JobId;	      /* set new JobId */
+         label->JobId);
+   mjcr->JobId = jr->JobId;           /* set new JobId */
    return mjcr;
 }
 
@@ -985,7 +1041,7 @@ static JCR *create_job_record(B_DB *db, JOB_DBR *jr, SESSION_LABEL *label,
  *  at Job termination time.
  */
 static int update_job_record(B_DB *db, JOB_DBR *jr, SESSION_LABEL *elabel,
-			      DEV_RECORD *rec)
+                              DEV_RECORD *rec)
 {
    struct date_time dt;
    struct tm tm;
@@ -994,7 +1050,7 @@ static int update_job_record(B_DB *db, JOB_DBR *jr, SESSION_LABEL *elabel,
    mjcr = get_jcr_by_session(rec->VolSessionId, rec->VolSessionTime);
    if (!mjcr) {
       Pmsg2(000, _("Could not find SessId=%d SessTime=%d for EOS record.\n"),
-		   rec->VolSessionId, rec->VolSessionTime);
+                   rec->VolSessionId, rec->VolSessionTime);
       return 0;
    }
    if (elabel->VerNum >= 11) {
@@ -1029,8 +1085,8 @@ static int update_job_record(B_DB *db, JOB_DBR *jr, SESSION_LABEL *elabel,
       return 0;
    }
    if (verbose) {
-      Pmsg2(000, _("Updated Job termination record for JobId=%u TermStat=%c\n"), jr->JobId,
-	 jr->JobStatus);
+      Pmsg3(000, _("Updated Job termination record for JobId=%u Level=%s TermStat=%c\n"), 
+         jr->JobId, job_level_to_str(mjcr->JobLevel), jr->JobStatus);
    }
    if (verbose > 1) {
       const char *term_msg;
@@ -1041,18 +1097,18 @@ static int update_job_record(B_DB *db, JOB_DBR *jr, SESSION_LABEL *elabel,
       switch (mjcr->JobStatus) {
       case JS_Terminated:
          term_msg = _("Backup OK");
-	 break;
+         break;
       case JS_FatalError:
       case JS_ErrorTerminated:
          term_msg = _("*** Backup Error ***");
-	 break;
+         break;
       case JS_Canceled:
          term_msg = _("Backup Canceled");
-	 break;
+         break;
       default:
-	 term_msg = term_code;
+         term_msg = term_code;
          sprintf(term_code, _("Job Termination code: %d"), mjcr->JobStatus);
-	 break;
+         break;
       }
       bstrftime(sdt, sizeof(sdt), mjcr->start_time);
       bstrftime(edt, sizeof(edt), mjcr->end_time);
@@ -1070,20 +1126,20 @@ static int update_job_record(B_DB *db, JOB_DBR *jr, SESSION_LABEL *elabel,
 "Volume Session Time:    %d\n"
 "Last Volume Bytes:      %s\n"
 "Termination:            %s\n\n"),
-	edt,
-	mjcr->JobId,
-	mjcr->Job,
-	mjcr->fileset_name,
-	job_level_to_str(mjcr->JobLevel),
-	mjcr->client_name,
-	sdt,
-	edt,
-	edit_uint64_with_commas(mjcr->JobFiles, ec1),
-	edit_uint64_with_commas(mjcr->JobBytes, ec2),
-	mjcr->VolSessionId,
-	mjcr->VolSessionTime,
-	edit_uint64_with_commas(mr.VolBytes, ec3),
-	term_msg);
+        edt,
+        mjcr->JobId,
+        mjcr->Job,
+        mjcr->fileset_name,
+        job_level_to_str(mjcr->JobLevel),
+        mjcr->client_name,
+        sdt,
+        edt,
+        edit_uint64_with_commas(mjcr->JobFiles, ec1),
+        edit_uint64_with_commas(mjcr->JobBytes, ec2),
+        mjcr->VolSessionId,
+        mjcr->VolSessionTime,
+        edit_uint64_with_commas(mr.VolBytes, ec3),
+        term_msg);
    }
    free_jcr(mjcr);
    return 1;
@@ -1092,21 +1148,23 @@ static int update_job_record(B_DB *db, JOB_DBR *jr, SESSION_LABEL *elabel,
 static int create_jobmedia_record(B_DB *db, JCR *mjcr)
 {
    JOBMEDIA_DBR jmr;
-   DCR *dcr = mjcr->dcr;
+   DCR *dcr = mjcr->read_dcr;
 
-   if (dev->state & ST_TAPE) {
+   if (dev->is_tape()) {
       dcr->EndBlock = dev->EndBlock;
       dcr->EndFile  = dev->EndFile;
+#ifdef needed
    } else {
       dcr->EndBlock = (uint32_t)dev->file_addr;
       dcr->EndFile = (uint32_t)(dev->file_addr >> 32);
-   }
+#endif
+   } 
 
    memset(&jmr, 0, sizeof(jmr));
    jmr.JobId = mjcr->JobId;
    jmr.MediaId = mr.MediaId;
    jmr.FirstIndex = dcr->VolFirstIndex;
-   jmr.LastIndex = dcr->FileIndex;
+   jmr.LastIndex = dcr->VolLastIndex;
    jmr.StartFile = dcr->StartFile;
    jmr.EndFile = dcr->EndFile;
    jmr.StartBlock = dcr->StartBlock;
@@ -1123,7 +1181,7 @@ static int create_jobmedia_record(B_DB *db, JCR *mjcr)
    }
    if (verbose) {
       Pmsg2(000, _("Created JobMedia record JobId %d, MediaId %d\n"),
-		jmr.JobId, jmr.MediaId);
+                jmr.JobId, jmr.MediaId);
    }
    return 1;
 }
@@ -1131,7 +1189,7 @@ static int create_jobmedia_record(B_DB *db, JCR *mjcr)
 /*
  * Simulate the database call that updates the MD5/SHA1 record
  */
-static int update_SIG_record(B_DB *db, char *SIGbuf, DEV_RECORD *rec, int type)
+static int update_digest_record(B_DB *db, char *digest, DEV_RECORD *rec, int type)
 {
    JCR *mjcr;
 
@@ -1139,9 +1197,9 @@ static int update_SIG_record(B_DB *db, char *SIGbuf, DEV_RECORD *rec, int type)
    if (!mjcr) {
       if (mr.VolJobs > 0) {
          Pmsg2(000, _("Could not find SessId=%d SessTime=%d for MD5/SHA1 record.\n"),
-		      rec->VolSessionId, rec->VolSessionTime);
+                      rec->VolSessionId, rec->VolSessionTime);
       } else {
-	 ignored_msgs++;
+         ignored_msgs++;
       }
       return 0;
    }
@@ -1151,7 +1209,7 @@ static int update_SIG_record(B_DB *db, char *SIGbuf, DEV_RECORD *rec, int type)
       return 1;
    }
 
-   if (!db_add_SIG_to_file_record(bjcr, db, mjcr->FileId, SIGbuf, type)) {
+   if (!db_add_digest_to_file_record(bjcr, db, mjcr->FileId, digest, type)) {
       Pmsg1(0, _("Could not add MD5/SHA1 to File record. ERR=%s\n"), db_strerror(db));
       free_jcr(mjcr);
       return 0;
@@ -1172,7 +1230,7 @@ static JCR *create_jcr(JOB_DBR *jr, DEV_RECORD *rec, uint32_t JobId)
    JCR *jobjcr;
    /*
     * Transfer as much as possible to the Job JCR. Most important is
-    *	the JobId and the ClientId.
+    *   the JobId and the ClientId.
     */
    jobjcr = new_jcr(sizeof(JCR), bscan_free_jcr);
    jobjcr->JobType = jr->JobType;
@@ -1185,31 +1243,29 @@ static JCR *create_jcr(JOB_DBR *jr, DEV_RECORD *rec, uint32_t JobId)
    jobjcr->VolSessionId = rec->VolSessionId;
    jobjcr->VolSessionTime = rec->VolSessionTime;
    jobjcr->ClientId = jr->ClientId;
-   new_dcr(jobjcr, dev);
+   jobjcr->read_dcr = new_dcr(jobjcr, dev);
+
    return jobjcr;
 }
 
 /* Dummies to replace askdir.c */
-bool	dir_get_volume_info(DCR *dcr, enum get_vol_info_rw  writing) { return 1;}
-bool	dir_find_next_appendable_volume(DCR *dcr) { return 1;}
-bool	dir_update_volume_info(DCR *dcr, bool relabel) { return 1; }
-bool	dir_create_jobmedia_record(DCR *dcr) { return 1; }
-bool	dir_ask_sysop_to_create_appendable_volume(DCR *dcr) { return 1; }
-bool	dir_update_file_attributes(DCR *dcr, DEV_RECORD *rec) { return 1;}
-bool	dir_send_job_status(JCR *jcr) {return 1;}
-
+bool    dir_get_volume_info(DCR *dcr, enum get_vol_info_rw  writing) { return 1;}
+bool    dir_find_next_appendable_volume(DCR *dcr) { return 1;}
+bool    dir_update_volume_info(DCR *dcr, bool relabel) { return 1; }
+bool    dir_create_jobmedia_record(DCR *dcr) { return 1; }
+bool    dir_ask_sysop_to_create_appendable_volume(DCR *dcr) { return 1; }
+bool    dir_update_file_attributes(DCR *dcr, DEV_RECORD *rec) { return 1;}
+bool    dir_send_job_status(JCR *jcr) {return 1;}
+int     generate_job_event(JCR *jcr, const char *event) { return 1; }
 
 bool dir_ask_sysop_to_mount_volume(DCR *dcr)
 {
    DEVICE *dev = dcr->dev;
    Dmsg0(20, "Enter dir_ask_sysop_to_mount_volume\n");
    /* Close device so user can use autochanger if desired */
-   if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) {
-      offline_dev(dev);
-   }
-   force_close_dev(dev);
-   fprintf(stderr, "Mount Volume \"%s\" on device %s and press return when ready: ",
-	 dcr->VolumeName, dev->print_name());
+   dev->close();
+   fprintf(stderr, _("Mount Volume \"%s\" on device %s and press return when ready: "),
+         dcr->VolumeName, dev->print_name());
    getchar();
    return true;
 }