From: Eric Bollengier <eric@baculasystems.com>
Date: Fri, 19 Jun 2020 14:07:02 +0000 (+0200)
Subject: Fix #6366 About an issue with verify job level=DiskToCatalog
X-Git-Tag: Release-9.6.6~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=573e8af41188455404832881ce1f5108be005f4a;p=thirdparty%2Fbacula.git

Fix #6366 About an issue with verify job level=DiskToCatalog
---

diff --git a/bacula/src/cats/sql_get.c b/bacula/src/cats/sql_get.c
index dfa014af3..ab188f127 100644
--- a/bacula/src/cats/sql_get.c
+++ b/bacula/src/cats/sql_get.c
@@ -96,7 +96,7 @@ bool BDB::bdb_get_file_record(JCR *jcr, JOB_DBR *jr, FILE_DBR *fdbr)
 {
    SQL_ROW row;
    bool ok = false;
-   char ed1[50], ed2[50], ed3[50];
+   char ed1[50], ed2[50], ed3[50], ed4[50];
 
    switch (jcr->getJobLevel()) {
    case L_VERIFY_VOLUME_TO_CATALOG:
@@ -113,10 +113,11 @@ bool BDB::bdb_get_file_record(JCR *jcr, JOB_DBR *jr, FILE_DBR *fdbr)
 "SELECT FileId, LStat, MD5 FROM File,Job WHERE "
 "File.JobId=Job.JobId AND File.PathId=%s AND "
 "File.FilenameId=%s AND Job.Type='B' AND Job.JobStatus IN ('T','W') AND "
-"ClientId=%s ORDER BY StartTime DESC LIMIT 1",
+"ClientId=%s AND Job.JobId=%s ORDER BY StartTime DESC LIMIT 1",
       edit_int64(fdbr->PathId, ed1), 
       edit_int64(fdbr->FilenameId, ed2), 
-      edit_int64(jr->ClientId,ed3));
+      edit_int64(jr->ClientId,ed3),
+      edit_uint64(jr->JobId, ed4));
       break;
    default:
       Mmsg(cmd,