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)
(cherry picked from commit b9f2ed303eedfa0b747884f8e66fbe97cfeeb0d5)

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index e1f4062afbe3737b15fbace2b72f0f0413ffbb80..0678856a3877641e9527ebe3d2715ce36165b9f5 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -3954,6 +3954,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);