From: Adam Kupczyk <akupczyk@mirantis.com>
Date: Fri, 24 Mar 2017 19:39:47 +0000 (+0100)
Subject: radosgw: fixes after rebase
X-Git-Tag: v12.0.2~34^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fac267dff69296267fcb8e90a06123616b52b75d;p=ceph.git

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 8eaaa58b21a7..80b181893f3d 100644
--- 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 8f8f2ef6ee16..e8149cc7f7a0 100644
--- 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 {