]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: don't preserve acls when copying object 5575/head
authorYehuda Sadeh <yehuda@redhat.com>
Thu, 13 Aug 2015 17:59:32 +0000 (10:59 -0700)
committerYehuda Sadeh <yehuda@redhat.com>
Thu, 13 Aug 2015 18:08:56 +0000 (11:08 -0700)
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>
src/rgw/rgw_rados.cc

index b5c359fa941e111ec851c9659e430a5f39cf4795..e7f327c904f24fff55402a206d283d8b627e9ce3 100644 (file)
@@ -4017,6 +4017,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);