From: Orit Wasserman <owasserm@redhat.com>
Date: Wed, 19 Oct 2016 19:51:01 +0000 (+0200)
Subject: rgw: fix put_acls for objects starting and ending with underscore
X-Git-Tag: v10.2.4~11^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=39b8e783defb930b1dd8eeecdfee68d0d886d03b;p=ceph.git

rgw: fix put_acls for objects starting and ending with underscore

Fixes: http://tracker.ceph.com/issues/17625
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 14d4d912c7b47c56b16ae0bdc6bc08d208de3461)
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 5382f6abfd7..2da2129dd4f 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -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);