Fix: clock diff, Dan's patch, Nic's patch, segfault

[bacula/bacula] / bacula / src / filed / backup.c

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index 2029f4f45bf3f339c1ff3a8edcba3c860bd48846..68c475df97e0302a3273f9c7789481d93b7f494d 100644 (file)
--- a/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@ -51,8 +51,6 @@ int blast_data_to_storage_daemon(JCR *jcr, char *addr)
 
    sd = jcr->store_bsock;
 
-   get_backup_privileges(jcr, 0);
-
    set_jcr_job_status(jcr, JS_Running);
 
    Dmsg1(110, "bfiled: opened data connection %d to stored\n", sd->fd);
@@ -73,7 +71,7 @@ int blast_data_to_storage_daemon(JCR *jcr, char *addr)
    jcr->compress_buf = get_memory(jcr->compress_buf_size);
 
    Dmsg1(100, "set_find_options ff=%p\n", jcr->ff);
-   set_find_options((FF_PKT *)jcr->ff, jcr->incremental, jcr->mtime);
+   set_find_options((FF_PKT *)jcr->ff, jcr->incremental, jcr->mtime, jcr->mtime_only);
    Dmsg0(110, "start find files\n");
 
    start_heartbeat_monitor(jcr);
@@ -111,7 +109,7 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
 {
    char attribs[MAXSTRING];
    char attribsEx[MAXSTRING];
-   int stat, stream; 
+   int stat, attr_stream, data_stream;
    struct MD5Context md5c;
    struct SHA1Context sha1c;
    int gotMD5 = 0;
@@ -156,14 +154,17 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
    case FT_NOACCESS:
       Jmsg(jcr, M_NOTSAVED, -1, _("     Could not access %s: ERR=%s\n"), ff_pkt->fname, 
         strerror(ff_pkt->ff_errno));
+      jcr->Errors++;
       return 1;
    case FT_NOFOLLOW:
       Jmsg(jcr, M_NOTSAVED, -1, _("     Could not follow link %s: ERR=%s\n"), ff_pkt->fname, 
         strerror(ff_pkt->ff_errno));
+      jcr->Errors++;
       return 1;
    case FT_NOSTAT:
       Jmsg(jcr, M_NOTSAVED, -1, _("     Could not stat %s: ERR=%s\n"), ff_pkt->fname, 
         strerror(ff_pkt->ff_errno));
+      jcr->Errors++;
       return 1;
    case FT_DIRNOCHG:
    case FT_NOCHG:
@@ -183,18 +184,28 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
    case FT_NOOPEN:
       Jmsg(jcr, M_NOTSAVED, -1, _("     Could not open directory %s: ERR=%s\n"), ff_pkt->fname, 
         strerror(ff_pkt->ff_errno));
+      jcr->Errors++;
       return 1;
    default:
       Jmsg(jcr, M_NOTSAVED, 0,  _("     Unknown file type %d; not saved: %s\n"), ff_pkt->type, ff_pkt->fname);
+      jcr->Errors++;
       return 1;
    }
 
    binit(&ff_pkt->bfd);
+   if (ff_pkt->flags & FO_PORTABLE) {
+      set_portable_backup(&ff_pkt->bfd); /* disable Win32 BackupRead() */
+   }
 
-   /* Open any file with data that we intend to save */
+   /* 
+    * Open any file with data that we intend to save.  
+    * Note, if is_win32_backup, we must open the Directory so that
+    * the BackupRead will save its permissions and ownership streams.
+    */
    if (ff_pkt->type != FT_LNKSAVED && (S_ISREG(ff_pkt->statp.st_mode) && 
         ff_pkt->statp.st_size > 0) || 
-        ff_pkt->type == FT_RAW || ff_pkt->type == FT_FIFO) {
+        ff_pkt->type == FT_RAW || ff_pkt->type == FT_FIFO ||
+        (!is_portable_backup(&ff_pkt->bfd) && ff_pkt->type == FT_DIR)) {
       btimer_id tid;   
       if (ff_pkt->type == FT_FIFO) {
         tid = start_thread_timer(pthread_self(), 60);
@@ -205,6 +216,7 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
         ff_pkt->ff_errno = errno;
          Jmsg(jcr, M_NOTSAVED, -1, _("     Cannot open %s: ERR=%s.\n"), ff_pkt->fname, 
              berror(&ff_pkt->bfd));
+        jcr->Errors++;
         stop_thread_timer(tid);
         return 1;
       }
@@ -212,8 +224,14 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
    }
 
    Dmsg1(130, "bfiled: sending %s to stored\n", ff_pkt->fname);
-   encode_stat(attribs, &ff_pkt->statp, ff_pkt->LinkFI);
-   stream = encode_attribsEx(jcr, attribsEx, ff_pkt);
+
+   /* Find what data stream we will use, then encode the attributes */
+   data_stream = select_data_stream(ff_pkt);
+   encode_stat(attribs, ff_pkt, data_stream);
+
+   /* Now possibly extend the attributes */
+   attr_stream = encode_attribsEx(jcr, attribsEx, ff_pkt);
+
    Dmsg3(200, "File %s\nattribs=%s\nattribsEx=%s\n", ff_pkt->fname, attribs, attribsEx);
      
    P(jcr->mutex);
@@ -226,7 +244,7 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
     * Send Attributes header to Storage daemon
     *   <file-index> <stream> <info>
     */
-   if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, stream)) {
+   if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, attr_stream)) {
       if (is_bopen(&ff_pkt->bfd)) {
         bclose(&ff_pkt->bfd);
       }
@@ -284,25 +302,15 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
       rbuf = sd->msg;                /* read buffer */             
       wbuf = sd->msg;                /* write buffer */
 
+
       Dmsg1(100, "Saving data, type=%d\n", ff_pkt->type);
 
-      if (ff_pkt->flags & FO_SPARSE) {
-        stream = STREAM_SPARSE_DATA;
-      } else {
-        stream = STREAM_FILE_DATA;
-      }
 
 #ifdef HAVE_LIBZ
       uLong compress_len, max_compress_len = 0;
       const Bytef *cbuf = NULL;
 
       if (ff_pkt->flags & FO_GZIP) {
-        if (stream == STREAM_FILE_DATA) {
-           stream = STREAM_GZIP_DATA;
-        } else {
-           stream = STREAM_SPARSE_GZIP_DATA;
-        }
-
         if (ff_pkt->flags & FO_SPARSE) {
            cbuf = (Bytef *)jcr->compress_buf + SPARSE_FADDR_SIZE;
            max_compress_len = jcr->compress_buf_size - SPARSE_FADDR_SIZE;
@@ -318,7 +326,7 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
        * Send Data header to Storage daemon
        *    <file-index> <stream> <info>
        */
-      if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, stream)) {
+      if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, data_stream)) {
         bclose(&ff_pkt->bfd);
         set_jcr_job_status(jcr, JS_ErrorTerminated);
         return 0;
@@ -338,6 +346,13 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
       if (ff_pkt->flags & FO_SPARSE) {
         rbuf += SPARSE_FADDR_SIZE;
         rsize -= SPARSE_FADDR_SIZE;
+#ifdef HAVE_FREEBSD_OS
+        /* 
+         * To read FreeBSD partitions, the read size must be
+         *  a multiple of 512.
+         */
+        rsize = (rsize/512) * 512;
+#endif
       }
 
       /* 
@@ -395,7 +410,6 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
         }
 #endif
 
-        /*       #ifndef FD_NO_SEND_TEST */
         /* Send the buffer to the Storage daemon */
         if (!sparseBlock) {
            if (ff_pkt->flags & FO_SPARSE) {
@@ -430,7 +444,6 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
       }
    }
 
-
    /* Terminate any MD5 signature and send it to Storage daemon and the Director */
    if (gotMD5 && ff_pkt->flags & FO_MD5) {
       MD5Final(signature, &md5c);
@@ -441,6 +454,7 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
       bnet_send(sd);
       bnet_sig(sd, BNET_EOD);        /* end of MD5 */
       gotMD5 = 0;
+
    } else if (gotSHA1 && ff_pkt->flags & FO_SHA1) {
    /* Terminate any SHA1 signature and send it to Storage daemon and the Director */
       SHA1Final(&sha1c, signature);