From e1ebfae87bded4f291de4a459479b3195987569f Mon Sep 17 00:00:00 2001 From: yuliyang Date: Mon, 12 Jun 2017 13:19:42 +0800 Subject: [PATCH] rgw: fix RGWPutBucketPolicy error when set BucketPolicy again without delete pre set Policy Fixes: http://tracker.ceph.com/issues/20252 Signed-off-by: yuliyang --- src/rgw/rgw_op.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 0118aca0c3234..9bdf62ace951f 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); -- 2.39.5