From: yuliyang <yuliyang@cmss.chinamobile.com>
Date: Mon, 12 Jun 2017 05:19:42 +0000 (+0800)
Subject: rgw: fix RGWPutBucketPolicy error when set BucketPolicy again without delete pre... 
X-Git-Tag: v12.1.0~134^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e1ebfae87bded4f291de4a459479b3195987569f;p=ceph.git

rgw: fix RGWPutBucketPolicy error when set BucketPolicy again without delete pre set Policy

Fixes: http://tracker.ceph.com/issues/20252

Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 0118aca0c32..9bdf62ace95 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -6507,6 +6507,7 @@ void RGWPutBucketPolicy::execute()
     Policy p(s->cct, s->bucket_tenant,
 	     bufferlist::static_from_mem(data, len));
     auto attrs = s->bucket_attrs;
+    attrs[RGW_ATTR_IAM_POLICY].clear();
     attrs[RGW_ATTR_IAM_POLICY].append(p.text);
     op_ret = rgw_bucket_set_attrs(store, s->bucket_info, attrs,
 				  &s->bucket_info.objv_tracker);