- Merge changes made to 1.38.3 into HEAD

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

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index 9ba76b4168457754af2f21b21b19b5cd538a3abc..0431a0fc0a0bab1598e82e5d305a4976cf02510e 100644 (file)
--- a/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@ -232,10 +232,6 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level)
 
    Dmsg1(130, "bfiled: sending %s to stored\n", ff_pkt->fname);
 
-   if (!encode_and_send_attributes(jcr, ff_pkt, data_stream)) {
-      return 0;
-   }
-
    /*
     * Setup for digest handling. If this fails, the digest will be set to NULL
     * and not used.
@@ -293,6 +289,11 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level)
       }
    }
 
+   /* Send attributes -- must be done after binit() */
+   if (!encode_and_send_attributes(jcr, ff_pkt, data_stream)) {
+      return 0;
+   }
+
    /*
     * Open any file with data that we intend to save, then save it.
     *
@@ -450,7 +451,7 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level)
 
       size = sizeof(md);
 
-      if (crypto_digest_finalize(digest, &md, &size) == true) {
+      if (crypto_digest_finalize(digest, &md, &size)) {
          bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, digest_stream);
          Dmsg1(300, "bfiled>stored:header %s\n", sd->msg);
          memcpy(sd->msg, md, size);