radosgw: fixes after rebase

Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>

diff --git a/src/rgw/rgw_client_io.cc b/src/rgw/rgw_client_io.cc
index 8eaaa58b21a7122d002bd6dfca9b82272ba5e355..80b181893f3da38e64364faf6a4e12359bc766d9 100644 (file)
--- a/src/rgw/rgw_client_io.cc
+++ b/src/rgw/rgw_client_io.cc
@@ -20,8 +20,8 @@ void BasicClient::init(CephContext *cct) {
     const auto& env_map = get_env().get_map();
 
     for (const auto& iter: env_map) {
-      rgw::crypt_sanitize::env x{iter->first, iter->second};
-      ldout(cct, 20) << iter->first << "=" << (x) << dendl;
+      rgw::crypt_sanitize::env x{iter.first, iter.second};
+      ldout(cct, 20) << iter.first << "=" << (x) << dendl;
     }
   }
 }

diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
index 8f8f2ef6ee169cbcb62a2b6c75aa2dee8e6cb264..e8149cc7f7a08583e0d51f14da21ef3644475f5f 100644 (file)
--- a/src/rgw/rgw_op.h
+++ b/src/rgw/rgw_op.h
@@ -1512,7 +1512,7 @@ public:
   const string name() override { return "init_multipart"; }
   RGWOpType get_type() override { return RGW_OP_INIT_MULTIPART; }
   uint32_t op_mask() override { return RGW_OP_TYPE_WRITE; }
-  int prepare_encryption(map<string, bufferlist>& attrs) { return 0; }
+  virtual int prepare_encryption(map<string, bufferlist>& attrs) { return 0; }
 };
 
 class RGWCompleteMultipart : public RGWOp {