Fix #9689 VolumeEncryption parameters must be yes|no|strong

diff --git a/bacula/src/stored/block.c b/bacula/src/stored/block.c
index 1e2fca5062bb79505ddd5224826094af47cf4274..f6c6ea49307518fcfd33bcfff114a89ff58a5a9f 100644 (file)
--- a/bacula/src/stored/block.c
+++ b/bacula/src/stored/block.c
@@ -74,11 +74,9 @@ bool DCR::write_block_to_device(bool final)
       ok = false;
       goto bail_out;   /* fatal error */
    }
-   if (dcr->despooling && dev->device->volume_encryption!=ET_NONE && dev->crypto_device_ctx!=NULL) {
-//      DEVICE *old = block->dev;
+   if (dcr->despooling && dev->device->volume_encryption != ET_NO
+         && dev->crypto_device_ctx!=NULL) {
       block->dev = dev;
-//      uint64_t checksum = ser_block_header(block, dev->do_checksum());
-//      block->dev = old;
    }
 
    Dmsg1(500, "Write block to dev=%p\n", dcr->dev);

diff --git a/bacula/src/stored/block_util.c b/bacula/src/stored/block_util.c
index 5028130cc2fd11d969f4da2dc59d6b0f363c5c60..02d4d5f065262d11a9e3c1cd3829c1e4df4241a3 100644 (file)
--- a/bacula/src/stored/block_util.c
+++ b/bacula/src/stored/block_util.c
@@ -384,7 +384,7 @@ uint64_t ser_block_header(DEV_BLOCK *block, bool do_checksum)
    ser_declare;
    uint32_t block_len = block->binbuf;
    uint32_t hdr_option = 0x0;
-   bool do_encrypt_vol = dev->device->volume_encryption!=ET_NONE && dev->crypto_device_ctx!=NULL;
+   bool do_encrypt_vol = dev->device->volume_encryption != ET_NO && dev->crypto_device_ctx != NULL;
    bool do_encrypt_block = do_encrypt_vol && !block->first_block;
    hdr_option |= (do_checksum?BLKHOPT_CHKSUM:0) |
                  (do_encrypt_vol?BLKHOPT_ENCRYPT_VOL:0) |

diff --git a/bacula/src/stored/dev.c b/bacula/src/stored/dev.c
index 9e3ab5dcb323b61e2afae484d04ba016284fa83c..8b33b2fc6d5e13fd02ae9c4cd7dedc1cf3083293 100644 (file)
--- a/bacula/src/stored/dev.c
+++ b/bacula/src/stored/dev.c
@@ -1175,7 +1175,7 @@ bool DEVICE::get_tape_worm(DCR *dcr)
 
 int DEVICE::use_volume_encryption()
 {
-   return device->volume_encryption != ET_NONE;
+   return device->volume_encryption != ET_NO;
 };
 
 bool DEVICE::load_encryption_key(DCR *dcr, const char *operation,
@@ -1194,7 +1194,8 @@ bool DEVICE::load_encryption_key(DCR *dcr, const char *operation,
    }
    /* don't use encryption if volume encryption is not enable or we are reading
     * (aka not recycling) a BB02 volume */
-   if (device->volume_encryption == ET_NONE || (op != op_label && !(VolHdr.blkh_options & BLKHOPT_ENCRYPT_VOL))) {
+   if (device->volume_encryption == ET_NO
+        || (op != op_label && !(VolHdr.blkh_options & BLKHOPT_ENCRYPT_VOL))) {
       return ok;
    }
    JCR *jcr = dcr->jcr;

diff --git a/bacula/src/stored/stored_conf.c b/bacula/src/stored/stored_conf.c
index 00c3cafbd1987767313e0faf36c84a44ac66894d..01dda27e07384266d0e5f3585ea3d056c9dcfbbc 100644 (file)
--- a/bacula/src/stored/stored_conf.c
+++ b/bacula/src/stored/stored_conf.c
@@ -297,9 +297,9 @@ s_kw dev_types[] = {
  *   encryption type     encryption code = token
  */
 s_kw enc_types[] = {
-   {"None",          ET_NONE},
-   {"Enable",        ET_ENABLE},
-   {"Strong",        ET_STRONG},
+   {"No",          ET_NO},
+   {"Yes",         ET_YES},
+   {"Strong",      ET_STRONG},
    {NULL,            0}
 };
 

diff --git a/bacula/src/stored/stored_conf.h b/bacula/src/stored/stored_conf.h
index ccb1d9573a954796afef62e2b25c4426b1bb3388..ebadb8b87f05f093482cd92b62b69436c243a2d6 100644 (file)
--- a/bacula/src/stored/stored_conf.h
+++ b/bacula/src/stored/stored_conf.h
@@ -300,7 +300,7 @@ extern s_kw enc_types[];
 
 /* Encryption type */
 enum  {
-   ET_NONE,
-   ET_ENABLE,
+   ET_NO,
+   ET_YES,
    ET_STRONG,
 };