From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 14 Jul 2009 14:01:19 +0000 (+0000)
Subject: ebl  Should fix #1323
X-Git-Tag: Release-3.0.2~78
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5cb2e1400a1bbdcbd28adfe4a8101cc83d09dea1;p=bacula%2Fbacula

ebl  Should fix #1323

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

diff --git a/bacula/src/cats/sql_get.c b/bacula/src/cats/sql_get.c
index 8190fa84ee..74b807ece5 100644
--- a/bacula/src/cats/sql_get.c
+++ b/bacula/src/cats/sql_get.c
@@ -33,7 +33,7 @@
  *
  *    Kern Sibbald, March 2000
  *
- *    Version $Id$
+ *    Version $Id: sql_get.c 8918 2009-06-23 11:56:35Z ricozz $
  */
 
 
diff --git a/bacula/src/dird/verify.c b/bacula/src/dird/verify.c
index 926fed7ee9..2f0eaa6588 100644
--- a/bacula/src/dird/verify.c
+++ b/bacula/src/dird/verify.c
@@ -750,7 +750,7 @@ void get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId)
    jcr->fn_printed = false;
    bsnprintf(buf, sizeof(buf),
       "SELECT Path.Path,Filename.Name FROM File,Path,Filename "
-      "WHERE File.JobId=%d "
+      "WHERE File.JobId=%d AND File.FileIndex > 0 "
       "AND File.MarkId!=%d AND File.PathId=Path.PathId "
       "AND File.FilenameId=Filename.FilenameId",
          JobId, jcr->JobId);
diff --git a/bacula/src/filed/verify_vol.c b/bacula/src/filed/verify_vol.c
index 3a29808bf9..7a9e88eac9 100644
--- a/bacula/src/filed/verify_vol.c
+++ b/bacula/src/filed/verify_vol.c
@@ -199,6 +199,11 @@ void do_verify_volume(JCR *jcr)
             stat = bnet_fsend(dir, "%d %d %s %s%c%s%c%s%c", jcr->JobFiles,
                           STREAM_UNIX_ATTRIBUTES, "pinsug5", fname,
                           0, ap, 0, lname, 0);
+         /* for a deleted record, we set fileindex=0 */
+         } else if (type == FT_DELETED)  {
+            stat = bnet_fsend(dir,"%d %d %s %s%c%s%c%c", 0,
+                          STREAM_UNIX_ATTRIBUTES, "pinsug5", fname,
+                          0, ap, 0, 0);
          } else {
             stat = bnet_fsend(dir,"%d %d %s %s%c%s%c%c", jcr->JobFiles,
                           STREAM_UNIX_ATTRIBUTES, "pinsug5", fname,