From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 18 Jan 2010 12:31:00 +0000 (+0100)
Subject: Remove FI sanity check code that does not apply after a VirtualFull
X-Git-Tag: Release-5.0.0~68
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3d6f161a8f76799cde5ebbb3f06de965e5ad9085;p=bacula%2Fbacula

Remove FI sanity check code that does not apply after a VirtualFull
---

diff --git a/bacula/src/stored/bextract.c b/bacula/src/stored/bextract.c
index 71c9da6bcb..d0bdc05685 100644
--- a/bacula/src/stored/bextract.c
+++ b/bacula/src/stored/bextract.c
@@ -329,13 +329,7 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
          Emsg0(M_ERROR_TERM, 0, _("Cannot continue.\n"));
       }
 
-      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);
-      }
-
       if (file_is_included(ff, attr->fname) && !file_is_excluded(ff, attr->fname)) {
-
          attr->data_stream = decode_stat(attr->attr, &attr->statp, &attr->LinkFI);
          if (!is_restore_stream_supported(attr->data_stream)) {
             if (!non_support_data++) {
diff --git a/bacula/src/stored/bls.c b/bacula/src/stored/bls.c
index 0526c52128..cb270d955d 100644
--- a/bacula/src/stored/bls.c
+++ b/bacula/src/stored/bls.c
@@ -31,7 +31,6 @@
  * 
  *  Kern Sibbald, MM
  *
- *   Version $Id$
  */
 
 #include "bacula.h"
@@ -393,11 +392,6 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
          return true;
       }
 
-      if (attr->file_index != rec->FileIndex) {
-         Emsg2(M_ERROR, 0, _("Record FileIndex %ld not equal Attrib FileIndex %ld\n"),
-               rec->FileIndex, attr->file_index);
-      }
-
       attr->data_stream = decode_stat(attr->attr, &attr->statp, &attr->LinkFI);
       build_attr_output_fnames(jcr, attr);
 
diff --git a/bacula/src/stored/bscan.c b/bacula/src/stored/bscan.c
index eb1d121306..854f70dffa 100644
--- a/bacula/src/stored/bscan.c
+++ b/bacula/src/stored/bscan.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2001-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2001-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -668,11 +668,6 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
          Emsg0(M_ERROR_TERM, 0, _("Cannot continue.\n"));
       }
 
-      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);
-      }
-
       if (verbose > 1) {
          decode_stat(attr->attr, &attr->statp, &attr->LinkFI);
          build_attr_output_fnames(bjcr, attr);