From dcbee282f1641c45d6c02667d5be50e21761379f Mon Sep 17 00:00:00 2001 From: Mark Houghton Date: Tue, 3 Nov 2020 15:14:06 +0000 Subject: [PATCH] rgw: rename variable for clarity Signed-off-by: Mark Houghton (cherry picked from commit 5d22b7d29a25db4f648daf0c51be74702d4149a2) Signed-off-by: Matt Benjamin Conflicts: src/rgw/rgw_op.cc --- src/rgw/rgw_op.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 27f71a38f78cf..19d4cb5fc7f9d 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -6302,11 +6302,11 @@ int RGWDeleteMultiObj::verify_permission() } } - bool empty = s->object.instance.empty(); + bool not_versioned = s->object.instance.empty(); auto usr_policy_res = eval_user_policies(s->iam_user_policies, s->env, boost::none, - empty ? + not_versioned ? rgw::IAM::s3DeleteObject : rgw::IAM::s3DeleteObjectVersion, ARN(s->bucket)); @@ -6317,7 +6317,7 @@ int RGWDeleteMultiObj::verify_permission() rgw::IAM::Effect r = Effect::Pass; if (s->iam_policy) { r = s->iam_policy->eval(s->env, *s->auth.identity, - empty ? + not_versioned ? rgw::IAM::s3DeleteObject : rgw::IAM::s3DeleteObjectVersion, ARN(s->bucket)); -- 2.39.5