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 93003682722da7d730467acccdcb45b2601f258c..2ff0e054f5024965576fc30a167de579e909f5ea 100644 (file)
--- 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 da0d98618b2836c5c1669c96fb1aed81eb22f6dd..7cabf02462922892564f428f506d3b4803469822 100644 (file)
--- 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;
          }
       }