From 2e82401c918297fbcc7f830a09c1f700cd95cc27 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 28 Mar 2017 15:01:59 -0400 Subject: [PATCH] rgw: fix build of conflict after auth rework Signed-off-by: Casey Bodley --- src/rgw/rgw_op.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index f172ba571a109..a000aaffc41a7 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -878,7 +878,7 @@ int RGWGetObj::read_user_manifest_part(rgw_bucket& bucket, * stored inside different accounts. */ if (s->system_request) { ldout(s->cct, 2) << "overriding permissions due to system operation" << dendl; - } else if (s->auth_identity->is_admin_of(s->user->user_id)) { + } else if (s->auth.identity->is_admin_of(s->user->user_id)) { ldout(s->cct, 2) << "overriding permissions due to admin operation" << dendl; } else if (!verify_object_permission(s, s->user_acl.get(), bucket_policy, &obj_policy, RGW_PERM_READ)) { -- 2.39.5