From: Yehuda Sadeh <yehuda@redhat.com>
Date: Thu, 13 Aug 2015 17:59:32 +0000 (-0700)
Subject: rgw: don't preserve acls when copying object
X-Git-Tag: v0.94.4~4^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b9f2ed303eedfa0b747884f8e66fbe97cfeeb0d5;p=ceph.git

rgw: don't preserve acls when copying object

Fixes: #12370

When copying an object we need to use the acls we calculated earlier,
and not the source acls.
This was broken at e41d97c8e38bb60d7e09e9801c0179efe7af1734.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit fb020247449d3daf033885bab5b3a10c0e5df4a5)
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index f4994f5e7bde..dfe4ad0b52e6 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -4007,6 +4007,8 @@ int RGWRados::copy_obj(RGWObjectCtx& obj_ctx,
     return ret;
   }
 
+  src_attrs[RGW_ATTR_ACL] = attrs[RGW_ATTR_ACL];
+
   set_copy_attrs(src_attrs, attrs, attrs_mod);
   attrs.erase(RGW_ATTR_ID_TAG);