From ae7d7859f57b6779ed113abca071bd204327d264 Mon Sep 17 00:00:00 2001
From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Mon, 24 Apr 2017 17:09:01 +0200
Subject: [PATCH] rgw: make the RGWPostObj_ObjStore::post_form_part public due
 to rgw_crypt.cc.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
---
 src/rgw/rgw_crypt.cc | 14 +++++++++-----
 src/rgw/rgw_crypt.h  | 19 ++++++++++++-------
 src/rgw/rgw_rest.h   |  3 ++-
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/rgw/rgw_crypt.cc b/src/rgw/rgw_crypt.cc
index cf48e27751f74..0d57f4da270a3 100644
--- a/src/rgw/rgw_crypt.cc
+++ b/src/rgw/rgw_crypt.cc
@@ -1053,7 +1053,9 @@ static const crypt_option_names crypt_options[] = {
 
 static boost::string_ref get_crypt_attribute(
     RGWEnv* env,
-    map<string, post_form_part, const ltstr_nocase>* parts,
+    std::map<std::string,
+             RGWPostObj_ObjStore::post_form_part,
+             const ltstr_nocase>* parts,
     crypt_option_e option)
 {
   static_assert(
@@ -1079,10 +1081,12 @@ static boost::string_ref get_crypt_attribute(
 
 
 int rgw_s3_prepare_encrypt(struct req_state* s,
-                       map<string, bufferlist>& attrs,
-                       map<string, post_form_part, const ltstr_nocase>* parts,
-                       std::unique_ptr<BlockCrypt>* block_crypt,
-                       std::map<std::string, std::string>& crypt_http_responses)
+                           std::map<std::string, ceph::bufferlist>& attrs,
+                           std::map<std::string,
+                                    RGWPostObj_ObjStore::post_form_part,
+                                    const ltstr_nocase>* parts,
+                           std::unique_ptr<BlockCrypt>* block_crypt,
+                           std::map<std::string, std::string>& crypt_http_responses)
 {
   int res = 0;
   crypt_http_responses.clear();
diff --git a/src/rgw/rgw_crypt.h b/src/rgw/rgw_crypt.h
index a6b7df0a42add..1774983758d0b 100644
--- a/src/rgw/rgw_crypt.h
+++ b/src/rgw/rgw_crypt.h
@@ -7,6 +7,7 @@
 #define CEPH_RGW_CRYPT_H
 
 #include <rgw/rgw_op.h>
+#include <rgw/rgw_rest.h>
 #include <rgw/rgw_rest_s3.h>
 #include <boost/utility/string_ref.hpp>
 
@@ -136,14 +137,18 @@ public:
 
 
 int rgw_s3_prepare_encrypt(struct req_state* s,
-                       map<string, bufferlist>& attrs,
-                       map<string, post_form_part, const ltstr_nocase>* parts,
-                       std::unique_ptr<BlockCrypt>* block_crypt,
-                       std::map<std::string, std::string>& crypt_http_responses);
+                           std::map<std::string, ceph::bufferlist>& attrs,
+                           std::map<std::string,
+                                    RGWPostObj_ObjStore::post_form_part,
+                                    const ltstr_nocase>* parts,
+                           std::unique_ptr<BlockCrypt>* block_crypt,
+                           std::map<std::string,
+                                    std::string>& crypt_http_responses);
 
 int rgw_s3_prepare_decrypt(struct req_state* s,
-                       map<string, bufferlist>& attrs,
-                       std::unique_ptr<BlockCrypt>* block_crypt,
-                       std::map<std::string, std::string>& crypt_http_responses);
+                           std::map<std::string, ceph::bufferlist>& attrs,
+                           std::unique_ptr<BlockCrypt>* block_crypt,
+                           std::map<std::string,
+                                    std::string>& crypt_http_responses);
 
 #endif
diff --git a/src/rgw/rgw_rest.h b/src/rgw/rgw_rest.h
index 15d3e3077f3a4..1c99ba9dadd4c 100644
--- a/src/rgw/rgw_rest.h
+++ b/src/rgw/rgw_rest.h
@@ -220,7 +220,7 @@ class RGWPostObj_ObjStore : public RGWPostObj
 {
   std::string boundary;
 
-protected:
+public:
   struct post_part_field {
     std::string val;
     std::map<std::string, std::string> params;
@@ -233,6 +233,7 @@ protected:
     ceph::bufferlist data;
   };
 
+protected:
   ceph::bufferlist in_data;
   std::map<std::string, post_form_part, const ltstr_nocase> parts;
 
-- 
2.39.5