/*
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.
int save_file(JCR *jcr, FF_PKT *ff_pkt, bool top_level);
static int send_data(JCR *jcr, int stream, FF_PKT *ff_pkt, DIGEST *digest, DIGEST *signature_digest);
bool encode_and_send_attributes(JCR *jcr, FF_PKT *ff_pkt, int &data_stream);
-static bool read_and_send_acl(JCR *jcr, int acltype, int stream);
static bool crypto_session_start(JCR *jcr);
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.
start_heartbeat_monitor(jcr);
- jcr->acl_text = get_pool_memory(PM_MESSAGE);
+ jcr->acl_data = get_pool_memory(PM_MESSAGE);
+ jcr->xattr_data = get_pool_memory(PM_MESSAGE);
/* Subroutine save_file() is called for each file */
if (!find_files(jcr, (FF_PKT *)jcr->ff, save_file, plugin_save)) {
accurate_send_deleted_list(jcr); /* send deleted list to SD */
- free_pool_memory(jcr->acl_text);
-
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;
}
}
do_read = true;
}
- Dmsg1(100, "do_read=%d\n", do_read);
+ Dmsg1(400, "do_read=%d\n", do_read);
if (do_read) {
btimer_t *tid;
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);
}
Dmsg1(300, "Saving Finder Info for \"%s\"\n", ff_pkt->fname);
sd->fsend("%ld %d 0", jcr->JobFiles, STREAM_HFSPLUS_ATTRIBUTES);
Dmsg1(300, "bfiled>stored:header %s\n", sd->msg);
- memcpy(sd->msg, ff_pkt->hfsinfo.fndrinfo, 32);
+ pm_memcpy(sd->msg, ff_pkt->hfsinfo.fndrinfo, 32);
sd->msglen = 32;
if (digest) {
crypto_digest_update(digest, (uint8_t *)sd->msg, sd->msglen);
}
#endif
- if (ff_pkt->flags & FO_ACL) {
- /* Read access ACLs for files, dirs and links */
- if (!read_and_send_acl(jcr, BACL_TYPE_ACCESS, STREAM_UNIX_ACCESS_ACL)) {
+ /*
+ * Save ACLs for anything not being a symlink.
+ */
+ 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.
+ */
+ if (ff_pkt->flags & FO_XATTR) {
+ if (!build_xattr_streams(jcr, ff_pkt))
goto bail_out;
- }
- /* Directories can have default ACLs too */
- if (ff_pkt->type == FT_DIREND && (BACL_CAP & BACL_CAP_DEFAULTS_DIR)) {
- if (!read_and_send_acl(jcr, BACL_TYPE_DEFAULT, STREAM_UNIX_DEFAULT_ACL)) {
- goto bail_out;
- }
- }
}
/* Terminate the signing digest and send it to the Storage daemon */
}
/* Send our header */
- sd->fsend("%ld %d 0", jcr->JobFiles, STREAM_SIGNED_DIGEST);
+ sd->fsend("%ld %ld 0", jcr->JobFiles, STREAM_SIGNED_DIGEST);
Dmsg1(300, "bfiled>stored:header %s\n", sd->msg);
/* Encode signature data */
* 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 */
/* Check for sparse blocks */
if (ff_pkt->flags & FO_SPARSE) {
ser_declare;
- bool haveBlock = true;
- if (sd->msglen == rsize &&
- fileAddr+sd->msglen < (uint64_t)ff_pkt->statp.st_size ||
+ bool allZeros = false;
+ if ((sd->msglen == rsize &&
+ fileAddr+sd->msglen < (uint64_t)ff_pkt->statp.st_size) ||
((ff_pkt->type == FT_RAW || ff_pkt->type == FT_FIFO) &&
(uint64_t)ff_pkt->statp.st_size == 0)) {
- haveBlock = !is_buf_zero(rbuf, rsize);
+ allZeros = is_buf_zero(rbuf, rsize);
}
- if (haveBlock) {
+ if (!allZeros) {
+ /* Put file address as first data in buffer */
ser_begin(wbuf, SPARSE_FADDR_SIZE);
ser_uint64(fileAddr); /* store fileAddr in begin of buffer */
}
fileAddr += sd->msglen; /* update file address */
- if (!haveBlock) {
+ /* Skip block of all zeros */
+ if (allZeros) {
continue; /* skip block of zeros */
}
}
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) {
return 0;
}
-/*
- * Read and send an ACL for the last encountered file.
- */
-static bool read_and_send_acl(JCR *jcr, int acltype, int stream)
-{
-#ifdef HAVE_ACL
- BSOCK *sd = jcr->store_bsock;
- POOLMEM *msgsave;
- int len;
-#ifdef FD_NO_SEND_TEST
- return true;
-#endif
-
- len = bacl_get(jcr, acltype);
- if (len < 0) {
- Jmsg1(jcr, M_WARNING, 0, _("Error reading ACL of %s\n"), jcr->last_fname);
- return true;
- }
- if (len == 0) {
- return true; /* no ACL */
- }
-
- /* Send header */
- if (!sd->fsend("%ld %d 0", jcr->JobFiles, stream)) {
- Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
- sd->bstrerror());
- return false;
- }
-
- /* Send the buffer to the storage deamon */
- Dmsg2(400, "Backing up ACL type 0x%2x <%s>\n", acltype, jcr->acl_text);
- msgsave = sd->msg;
- sd->msg = jcr->acl_text;
- sd->msglen = len + 1;
- if (!sd->send()) {
- sd->msg = msgsave;
- sd->msglen = 0;
- Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
- sd->bstrerror());
- return false;
- }
-
- jcr->JobBytes += sd->msglen;
- sd->msg = msgsave;
- if (!sd->signal(BNET_EOD)) {
- Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
- sd->bstrerror());
- return false;
- }
-
- Dmsg1(200, "ACL of file: %s successfully backed up!\n", jcr->last_fname);
-#endif
- return true;
-}
-
bool encode_and_send_attributes(JCR *jcr, FF_PKT *ff_pkt, int &data_stream)
{
BSOCK *sd = jcr->store_bsock;
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);
projects / bacula / bacula / blobdiff