From: Alain Spineux <alain@baculasystems.com>
Date: Tue, 15 Nov 2022 15:11:41 +0000 (+0100)
Subject: Fix VolEncrypted in get_scratch_volume()
X-Git-Tag: Beta-15.0.0~358
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=943c34f915a500e9f206f2f50698ae4e2f05da63;p=thirdparty%2Fbacula.git

Fix VolEncrypted in get_scratch_volume()

- get_scratch_volume() was not using the right VolEncrypted value for
  the SQL query
- this fix tests :
failed   651s  tests/copy-uncopied-test
failed   651s  tests/copy-volume-test
failed   651s  tests/next-vol-test
failed    69s  tests/verify-data-test
failed   651s  tests/scratchpool-pool-test
---

diff --git a/bacula/src/dird/next_vol.c b/bacula/src/dird/next_vol.c
index 3d8e06bc5..91e0cd32e 100644
--- a/bacula/src/dird/next_vol.c
+++ b/bacula/src/dird/next_vol.c
@@ -474,6 +474,7 @@ bool get_scratch_volume(JCR *jcr, bool InChanger, MEDIA_DBR *mr,
    bmemset(&spr, 0, sizeof(spr));
    bstrncpy(spr.Name, "Scratch", sizeof(spr.Name));
    spr.PoolId = mr->ScratchPoolId;
+   smr.VolEncrypted = mr->VolEncrypted;
    if (db_get_pool_record(jcr, jcr->db, &spr)) {
       smr.PoolId = spr.PoolId;
       bstrncpy(smr.VolStatus, "Append", sizeof(smr.VolStatus));  /* want only appendable volumes */