/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2009 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.
static void crypto_session_end(JCR *jcr);
static bool crypto_session_send(JCR *jcr, BSOCK *sd);
-/*
- * check for BSD nodump flag
- */
-static bool no_dump(JCR *jcr, FF_PKT *ff_pkt)
-{
-#if defined(HAVE_CHFLAGS) && defined(UF_NODUMP)
- if ( (ff_pkt->flags & FO_HONOR_NODUMP) &&
- (ff_pkt->statp.st_flags & UF_NODUMP) ) {
- Jmsg(jcr, M_INFO, 1, _(" NODUMP flag set - will not process %s\n"),
- ff_pkt->fname);
- return true; /* do not backup this file */
- }
-#endif
- return false; /* do backup */
-}
-
/*
* Find all the requested files and send them
* to the Storage daemon.
accurate_send_deleted_list(jcr); /* send deleted list to SD */
- free_pool_memory(jcr->acl_data);
- free_pool_memory(jcr->xattr_data);
-
stop_heartbeat_monitor(jcr);
sd->signal(BNET_EOD); /* end of sending data */
+ if (jcr->acl_data) {
+ free_pool_memory(jcr->acl_data);
+ jcr->acl_data = NULL;
+ }
+ if (jcr->xattr_data) {
+ free_pool_memory(jcr->xattr_data);
+ jcr->xattr_data = NULL;
+ }
if (jcr->big_buf) {
free(jcr->big_buf);
jcr->big_buf = NULL;
break;
case FT_REGE:
Dmsg1(130, "FT_REGE saving: %s\n", ff_pkt->fname);
- if (no_dump(jcr, ff_pkt))
- return 1;
has_file_data = true;
break;
case FT_REG:
Dmsg1(130, "FT_REG saving: %s\n", ff_pkt->fname);
- if (no_dump(jcr, ff_pkt))
- return 1;
has_file_data = true;
break;
case FT_LNK:
break;
case FT_DIRBEGIN:
jcr->num_files_examined--; /* correct file count */
- if (no_dump(jcr, ff_pkt)) /* disable recursion on nodump directories */
- ff_pkt->flags |= FO_NO_RECURSION;
return 1; /* not used */
case FT_NORECURSE:
Jmsg(jcr, M_INFO, 1, _(" Recursion turned off. Will not descend from %s into %s\n"),
berrno be;
Jmsg(jcr, M_NOTSAVED, 0, _(" Could not access \"%s\": ERR=%s\n"), ff_pkt->fname,
be.bstrerror(ff_pkt->ff_errno));
- jcr->Errors++;
+ jcr->JobErrors++;
return 1;
}
case FT_NOFOLLOW: {
berrno be;
Jmsg(jcr, M_NOTSAVED, 0, _(" Could not follow link \"%s\": ERR=%s\n"),
ff_pkt->fname, be.bstrerror(ff_pkt->ff_errno));
- jcr->Errors++;
+ jcr->JobErrors++;
return 1;
}
case FT_NOSTAT: {
berrno be;
Jmsg(jcr, M_NOTSAVED, 0, _(" Could not stat \"%s\": ERR=%s\n"), ff_pkt->fname,
be.bstrerror(ff_pkt->ff_errno));
- jcr->Errors++;
+ jcr->JobErrors++;
return 1;
}
case FT_DIRNOCHG:
berrno be;
Jmsg(jcr, M_NOTSAVED, 0, _(" Could not open directory \"%s\": ERR=%s\n"),
ff_pkt->fname, be.bstrerror(ff_pkt->ff_errno));
- jcr->Errors++;
+ jcr->JobErrors++;
return 1;
}
default:
Jmsg(jcr, M_NOTSAVED, 0, _(" Unknown file type %d; not saved: %s\n"),
ff_pkt->type, ff_pkt->fname);
- jcr->Errors++;
+ jcr->JobErrors++;
return 1;
}
if (signing_digest == NULL) {
Jmsg(jcr, M_NOTSAVED, 0, _("%s signature digest initialization failed\n"),
stream_to_ascii(signing_algorithm));
- jcr->Errors++;
+ jcr->JobErrors++;
goto good_rtn;
}
}
berrno be;
Jmsg(jcr, M_NOTSAVED, 0, _(" Cannot open \"%s\": ERR=%s.\n"), ff_pkt->fname,
be.bstrerror());
- jcr->Errors++;
+ jcr->JobErrors++;
if (tid) {
stop_thread_timer(tid);
tid = NULL;
berrno be;
Jmsg(jcr, M_NOTSAVED, -1, _(" Cannot open resource fork for \"%s\": ERR=%s.\n"),
ff_pkt->fname, be.bstrerror());
- jcr->Errors++;
+ jcr->JobErrors++;
if (is_bopen(&ff_pkt->bfd)) {
bclose(&ff_pkt->bfd);
}
#endif
/*
- * Save ACLs for anything not being a symlink.
+ * Save ACLs for anything not being a symlink and not being a plugin.
*/
- if (ff_pkt->flags & FO_ACL && ff_pkt->type != FT_LNK) {
- if (!build_acl_streams(jcr, ff_pkt))
- goto bail_out;
+ if (!ff_pkt->cmd_plugin) {
+ if (ff_pkt->flags & FO_ACL && ff_pkt->type != FT_LNK) {
+ if (!build_acl_streams(jcr, ff_pkt))
+ goto bail_out;
+ }
}
/*
- * Save Extended Attributes for all files.
+ * Save Extended Attributes for all files not being a plugin.
*/
- if (ff_pkt->flags & FO_XATTR) {
- if (!build_xattr_streams(jcr, ff_pkt))
- goto bail_out;
+ if (!ff_pkt->cmd_plugin) {
+ if (ff_pkt->flags & FO_XATTR) {
+ if (!build_xattr_streams(jcr, ff_pkt))
+ goto bail_out;
+ }
}
/* Terminate the signing digest and send it to the Storage daemon */
* Currently this is not a problem as the only other stream, resource forks,
* are not handled as sparse files.
*/
-int send_data(JCR *jcr, int stream, FF_PKT *ff_pkt, DIGEST *digest,
- DIGEST *signing_digest)
+static int send_data(JCR *jcr, int stream, FF_PKT *ff_pkt, DIGEST *digest,
+ DIGEST *signing_digest)
{
BSOCK *sd = jcr->store_bsock;
uint64_t fileAddr = 0; /* file address */
berrno be;
Jmsg(jcr, M_ERROR, 0, _("Read error on file %s. ERR=%s\n"),
ff_pkt->fname, be.bstrerror(ff_pkt->bfd.berrno));
- if (jcr->Errors++ > 1000) { /* insanity check */
+ if (jcr->JobErrors++ > 1000) { /* insanity check */
Jmsg(jcr, M_FATAL, 0, _("Too many errors.\n"));
}
} else if (ff_pkt->flags & FO_ENCRYPT) {
Jmsg0(jcr, M_FATAL, 0, _("Invalid file flags, no supported data stream type.\n"));
return false;
}
- encode_stat(attribs, ff_pkt, data_stream);
+ encode_stat(attribs, &ff_pkt->statp, ff_pkt->LinkFI, data_stream);
/* Now possibly extend the attributes */
attr_stream = encode_attribsEx(jcr, attribsEx, ff_pkt);