From 65f303ac10aae8841dc2057b00648c9bca300d92 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Thu, 13 Aug 2015 10:59:32 -0700 Subject: [PATCH] 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 (cherry picked from commit fb020247449d3daf033885bab5b3a10c0e5df4a5) (cherry picked from commit b9f2ed303eedfa0b747884f8e66fbe97cfeeb0d5) --- src/rgw/rgw_rados.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index e1f4062afbe37..0678856a38776 100644 --- 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); -- 2.39.5