X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Ffiled%2Fverify.c;h=f280c05b01f6ed82ed5bca20e73715b5e0b5cf56;hb=bbbc4771dfad256a2ad69cbf8b5914e9f99e2463;hp=d3ef3b656207b7a500ba97a8bb71c71c558c928d;hpb=d9013540f1f7d8becb3c4fcb247d8e7a7f394d00;p=bacula%2Fbacula diff --git a/bacula/src/filed/verify.c b/bacula/src/filed/verify.c index d3ef3b6562..f280c05b01 100644 --- a/bacula/src/filed/verify.c +++ b/bacula/src/filed/verify.c @@ -1,12 +1,12 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2009 Free Software Foundation Europe e.V. + Copyright (C) 2000-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. This program is Free Software; you can redistribute it and/or - modify it under the terms of version two of the GNU General Public + modify it under the terms of version three of the GNU Affero General Public License as published by the Free Software Foundation and included in the file LICENSE. @@ -15,7 +15,7 @@ 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 + You should have received a copy of the GNU Affero General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -30,8 +30,6 @@ * * Kern Sibbald, October MM * - * Version $Id$ - * */ #include "bacula.h" @@ -157,6 +155,8 @@ static int verify_file(JCR *jcr, FF_PKT *ff_pkt, bool top_level) case FT_NOFSCHG: Jmsg(jcr, M_SKIPPED, 1, _(" File system change prohibited. Directory skipped: %s\n"), ff_pkt->fname); return 1; + case FT_RESTORE_FIRST: + return 1; /* silently skip */ case FT_NOOPEN: { berrno be; be.set_errno(ff_pkt->ff_errno); @@ -369,7 +369,7 @@ static int read_digest(BFILE *bfd, DIGEST *digest, JCR *jcr) crypto_digest_update(digest, (uint8_t *)buf, n); /* Can be used by BaseJobs, update only for Verify jobs */ - if (jcr->get_JobLevel() != L_FULL) { + if (jcr->getJobLevel() != L_FULL) { jcr->JobBytes += n; jcr->ReadBytes += n; }