From: Norbert Bizet <norbert.bizet@baculasystems.com>
Date: Wed, 3 Mar 2021 16:06:14 +0000 (-0500)
Subject: Fix Bacula_11.0 build by inverting dependencies
X-Git-Tag: Release-11.0.2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ba6946bb34e257c2eab1614e4b991590b5b2b7b;p=thirdparty%2Fbacula.git

Fix Bacula_11.0 build by inverting dependencies
---

diff --git a/bacula/src/stored/cloud_glacier.h b/bacula/src/stored/cloud_glacier.h
index 930036827..2ff0e054f 100644
--- a/bacula/src/stored/cloud_glacier.h
+++ b/bacula/src/stored/cloud_glacier.h
@@ -43,7 +43,7 @@ public:
    cloud_glacier() {};
    virtual ~cloud_glacier() {};
    
-   virtual bool init(cloud_glacier_ctx *ctx, POOLMEM *&err) = 0;
+   virtual bool init(CLOUD *cloud, POOLMEM *&err) = 0;
    virtual bool restore_cloud_object(transfer *xfer, const char *cloud_fname) = 0;
    virtual bool is_waiting_on_server(transfer *xfer, const char *cloud_fname) = 0;
 };
@@ -51,7 +51,7 @@ public:
 class dummy_glacier: public cloud_glacier {
 public:
    dummy_glacier() {};
-   bool init (cloud_glacier_ctx *ctx, POOLMEM *&err)
+   bool init (CLOUD *cloud, POOLMEM *&err)
    {
       Mmsg(err, "Cloud glacier not properly loaded");
       return false;
diff --git a/bacula/src/stored/s3_driver.c b/bacula/src/stored/s3_driver.c
index da0d98618..7cabf0246 100644
--- a/bacula/src/stored/s3_driver.c
+++ b/bacula/src/stored/s3_driver.c
@@ -854,18 +854,7 @@ bool s3_driver::init(CLOUD *cloud, POOLMEM *&err)
    if (me) {
       load_glacier_driver(me->plugin_directory);
       if (glacier_item.ptr) {
-         s3_cloud_glacier_ctx glacier_ctx;
-         glacier_ctx.host_name = cloud->host_name;
-         glacier_ctx.bucket_name = cloud->bucket_name;
-         glacier_ctx.protocol = (S3Protocol)cloud->protocol;
-         glacier_ctx.uri_style = (S3UriStyle)cloud->uri_style;
-         glacier_ctx.access_key = cloud->access_key;
-         glacier_ctx.secret_key = cloud->secret_key;
-         glacier_ctx.region = cloud->region;
-         glacier_ctx.transfer_priority = cloud->transfer_priority;
-         glacier_ctx.transfer_retention = cloud->transfer_retention;
-
-         if (!glacier_item.ptr->init(&glacier_ctx, err)) {
+         if (!glacier_item.ptr->init(cloud, err)) {
             return false;
          }
       }