Fix a cosmetic bug that caused spurious OpenSSL error messages; there is no reason...

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

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index 16659dc66a5f0e9fe3c2ce2f8af78a4eb836082b..f44fdda547245da0b8e25127a9cb4f7273feef74 100644 (file)
--- a/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@ -233,23 +233,27 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level)
       jcr->num_files_examined--;      /* correct file count */
       return 1;                       /* not used */
    case FT_NORECURSE:
-     Jmsg(jcr, M_INFO, 1, _("     Recursion turned off. Will not descend into %s\n"),
-          ff_pkt->fname);
+      Jmsg(jcr, M_INFO, 1, _("     Recursion turned off. Will not descend from %s into %s\n"),
+           ff_pkt->top_fname, ff_pkt->fname);
       ff_pkt->type = FT_DIREND;       /* Backup only the directory entry */
       break;
    case FT_NOFSCHG:
       /* Suppress message for /dev filesystems */
       if (strncmp(ff_pkt->fname, "/dev/", 5) != 0) {
-         Jmsg(jcr, M_INFO, 1, _("     Filesystem change prohibited. Will not descend into %s\n"),
-            ff_pkt->fname);
+         Jmsg(jcr, M_INFO, 1, _("     %s is a different filesystem. Will not descend from %s into %s\n"),
+              ff_pkt->fname, ff_pkt->top_fname, ff_pkt->fname);
       }
       ff_pkt->type = FT_DIREND;       /* Backup only the directory entry */
       break;
    case FT_INVALIDFS:
-      Jmsg(jcr, M_INFO, 1, _("     Disallowed filesystem. Will not descend into %s\n"),
-           ff_pkt->fname);
+      Jmsg(jcr, M_INFO, 1, _("     Disallowed filesystem. Will not descend from %s into %s\n"),
+           ff_pkt->top_fname, ff_pkt->fname);
       ff_pkt->type = FT_DIREND;       /* Backup only the directory entry */
       break;
+   case FT_INVALIDDT:
+      Jmsg(jcr, M_INFO, 1, _("     Disallowed drive type. Will not descend into %s\n"),
+           ff_pkt->fname);
+      break;
    case FT_DIREND:
       Dmsg1(130, "FT_DIREND: %s\n", ff_pkt->link);
       break;
@@ -464,10 +468,10 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level)
       memcpy(sd->msg, ff_pkt->hfsinfo.fndrinfo, 32);
       sd->msglen = 32;
       if (digest) {
-         crypto_digest_update(digest, sd->msg, sd->msglen);
+         crypto_digest_update(digest, (uint8_t *)sd->msg, sd->msglen);
       }
       if (signing_digest) {
-         crypto_digest_update(signing_digest, sd->msg, sd->msglen);
+         crypto_digest_update(signing_digest, (uint8_t *)sd->msg, sd->msglen);
       }
       bnet_send(sd);
       bnet_sig(sd, BNET_EOD);
@@ -527,7 +531,7 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level)
       Dmsg1(300, "bfiled>stored:header %s\n", sd->msg);
 
       /* Grow the bsock buffer to fit our message if necessary */
-      if (sizeof_pool_memory(sd->msg) < size) {
+      if (sizeof_pool_memory(sd->msg) < (int32_t)size) {
          sd->msg = realloc_pool_memory(sd->msg, size);
       }