From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 27 Dec 2008 08:06:56 +0000 (+0000)
Subject: kes  Turn on Eric's match_bsr tape block checking code.
X-Git-Tag: Release-7.0.0~3554
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=47c7bb69762db5b92af729c031fa4931e5f79325;p=bacula%2Fbacula

kes  Turn on Eric's match_bsr tape block checking code.
kes  Correct values used for tape block numbers in record.c.

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

diff --git a/bacula/src/stored/match_bsr.c b/bacula/src/stored/match_bsr.c
index ee7274f117..88ec25d15c 100644
--- a/bacula/src/stored/match_bsr.c
+++ b/bacula/src/stored/match_bsr.c
@@ -636,6 +636,8 @@ static int match_voladdr(BSR *bsr, BSR_VOLADDR *voladdr, DEV_RECORD *rec, bool d
       return 1;                       /* no specification matches all */
    }
 
+#ifdef xxx
+
    /* For the moment, these tests work only with disk. */
    if (rec->state & REC_ISTAPE) {
       uint32_t sFile = (voladdr->saddr)>>32;
@@ -645,6 +647,8 @@ static int match_voladdr(BSR *bsr, BSR_VOLADDR *voladdr, DEV_RECORD *rec, bool d
       }
    }
 
+#endif
+
    uint64_t addr = get_record_address(rec);
    Dmsg6(dbglevel, "match_voladdr: saddr=%llu eaddr=%llu recaddr=%llu sfile=%u efile=%u recfile=%u\n",
          voladdr->saddr, voladdr->eaddr, addr, voladdr->saddr>>32, voladdr->eaddr>>32, addr>>32);
diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 6a3cc7d399..f4fca00795 100644
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -10,6 +10,9 @@ filepattern (restore with regex in bsr)
 mixed priorities
 
 General:
+26Dec08
+kes  Turn on Eric's match_bsr tape block checking code.
+kes  Correct values used for tape block numbers in record.c.
 23Dec08
 ebl  Fix a problem with PoolUncopiedJobs option which was broken
      by the new JT_JOB_COPY type.