]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix put_acls for objects starting and ending with underscore 11669/head
authorOrit Wasserman <owasserm@redhat.com>
Wed, 19 Oct 2016 19:51:01 +0000 (21:51 +0200)
committerOrit Wasserman <owasserm@redhat.com>
Thu, 27 Oct 2016 18:27:54 +0000 (20:27 +0200)
Fixes: http://tracker.ceph.com/issues/17625
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 14d4d912c7b47c56b16ae0bdc6bc08d208de3461)

src/rgw/rgw_op.cc

index 5382f6abfd7f8e42caeb15351dbe3d5f91a4a841..2da2129dd4ffee0c88adc33bd4ad18b9a3fb41e0 100644 (file)
@@ -3556,7 +3556,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);