BEE Backport bacula/src/filed/accurate.c

This commit is the result of the squash of the following main commits:

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Thu Mar 28 17:50:03 2019 +0100

    Fix #4792 about incorrect FileSet { Options {} } not detected (accurate, basejob and verify)

diff --git a/bacula/src/filed/accurate.c b/bacula/src/filed/accurate.c
index 0dc09fa7572287a607ad2dcaa9b47af62c1db782..1951d5a1f4e57cce3ebbbee90b1653dc695425b2 100644 (file)
--- a/bacula/src/filed/accurate.c
+++ b/bacula/src/filed/accurate.c
@@ -381,6 +381,8 @@ bool accurate_check_file(JCR *jcr, FF_PKT *ff_pkt)
    /*
     * Loop over options supplied by user and verify the
     * fields he requests.
+    *
+    * If an option is added, make sure to update dird/inc_conf.c and BWeb as well.
     */
    for (char *p=opts; !stat && *p; p++) {
       char ed1[30], ed2[30];
@@ -502,7 +504,7 @@ bool accurate_check_file(JCR *jcr, FF_PKT *ff_pkt)
              * to NULL and not used.
              */
             if (ff_pkt->flags & FO_MD5) {
-               digest = crypto_digest_new(jcr, CRYPTO_DIGEST_MD5);
+               digest = crypto_digest_new(jcr, CRYPTO_DIGEST_MD5); /* TODO: With FIPS, MD5 is disabled */
                digest_stream = STREAM_MD5_DIGEST;
 
             } else if (ff_pkt->flags & FO_SHA1) {