Skip to content

Commit

Permalink
rgw: rename variable for clarity
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Houghton <mhoughton@microfocus.com>
  • Loading branch information
markhoughton-microfocus committed Nov 20, 2020
1 parent ba23750 commit 5d22b7d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/rgw/rgw_op.cc
Expand Up @@ -6404,11 +6404,11 @@ int RGWDeleteMultiObj::verify_permission(optional_yield y)
}
}

bool empty = rgw::sal::RGWObject::empty(s->object.get()) || s->object->get_instance().empty();
bool not_versioned = rgw::sal::RGWObject::empty(s->object.get()) || s->object->get_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->get_key()));
Expand All @@ -6419,7 +6419,7 @@ int RGWDeleteMultiObj::verify_permission(optional_yield y)
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->get_key()));
Expand Down

0 comments on commit 5d22b7d

Please sign in to comment.