Tentative fix for missing digest signature in bug 807.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4672 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index c39c457f7fd86dd221aa32b976d904ec75d1cd98..156542bfdeb01bd5c8ffa438afde681c577a6b3e 100644 (file)
--- a/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@ -1,12 +1,3 @@
-/*
- *  Bacula File Daemon  backup.c  send file attributes and data
- *   to the Storage daemon.
- *
- *    Kern Sibbald, March MM
- *
- *   Version $Id$
- *
- */
 /*
    Bacula® - The Network Backup Solution
 
@@ -34,6 +25,15 @@
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
 */
+/*
+ *  Bacula File Daemon  backup.c  send file attributes and data
+ *   to the Storage daemon.
+ *
+ *    Kern Sibbald, March MM
+ *
+ *   Version $Id$
+ *
+ */
 
 #include "bacula.h"
 #include "filed.h"
@@ -159,7 +159,6 @@ bool blast_data_to_storage_daemon(JCR *jcr, char *addr)
    if (!find_files(jcr, (FF_PKT *)jcr->ff, save_file, (void *)jcr)) {
       ok = false;                     /* error */
       set_jcr_job_status(jcr, JS_ErrorTerminated);
-//    Jmsg(jcr, M_FATAL, 0, _("Find files error.\n"));
    }
 
    free_pool_memory(jcr->acl_text);
@@ -428,7 +427,6 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level)
     * 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)) {
 #ifdef HAVE_WIN32
       do_read = !is_portable_backup(&ff_pkt->bfd) || ff_pkt->statp.st_size > 0;
@@ -586,7 +584,6 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level)
       sd->msglen = size;
       bnet_send(sd);
       bnet_sig(sd, BNET_EOD);              /* end of checksum */
-      goto good_rtn;
    }
 
    /* Terminate any digest and send it to Storage daemon and the Director */

diff --git a/bacula/src/filed/restore.c b/bacula/src/filed/restore.c
index ca15bda551d8a3d0a68b00e4ad506cd21639edce..d7b56ff7cea0c411ff3d0fc1849eb2db6cb01aee 100644 (file)
--- a/bacula/src/filed/restore.c
+++ b/bacula/src/filed/restore.c
@@ -1085,7 +1085,8 @@ again:
    if (!crypto_cipher_finalize(cipher_ctx->cipher, (uint8_t *)&cipher_ctx->buf[cipher_ctx->buf_len],
         &decrypted_len)) {
       /* Writing out the final, buffered block failed. Shouldn't happen. */
-      Jmsg1(jcr, M_FATAL, 0, _("Decryption error for %s\n"), jcr->last_fname);
+      Jmsg3(jcr, M_ERROR, 0, _("Decryption error. buf_len=%d decrypt_len=%d on file %s\n"), 
+            cipher_ctx->buf_len, decrypted_len, jcr->last_fname);
    }
 
    Dmsg2(30, "Flush decrypt len=%d buf_len=%d\n", decrypted_len, cipher_ctx->buf_len);

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 1e763ff95d785f6ac0fd2757de6950b1fb5bf83d..e93ad3861bb20b3e2eb04527638bdeaefe1435c6 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -2,6 +2,7 @@
 
 General:
 02May07
+kes  Tentative fix for missing digest signature in bug 807.
 kes  Correct handle problem in new win32_ftruncate routine.
 kes  Convert ua_purge.c and ua_update.c to use new ua class
      message routines for bat.