]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix put_acls for objects starting and ending with underscore 11566/head
authorOrit Wasserman <owasserm@redhat.com>
Wed, 19 Oct 2016 19:51:01 +0000 (21:51 +0200)
committerOrit Wasserman <owasserm@redhat.com>
Wed, 19 Oct 2016 19:56:04 +0000 (21:56 +0200)
Fixes: http://tracker.ceph.com/issues/17625
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
src/rgw/rgw_op.cc

index a6f22b2f9fc0d0ecbd1d07372607b829df7c8127..2c03a6e924ad032febe593bb320a56af53347ce2 100644 (file)
@@ -3984,7 +3984,8 @@ void RGWPutACLs::execute()
   }
 
   new_policy.encode(bl);
-  obj = rgw_obj(s->bucket, s->object);
+  obj = rgw_obj(s->bucket, s->object.name);
+  obj.set_instance(s->object.instance);
   map<string, bufferlist> attrs;
 
   store->set_atomic(s->obj_ctx, obj);