RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-08 09:19:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19773 from chuang-he/fix_create_form_headers

Browse Source 
rgw: fix the return type is wrong

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Yuri Weinstein 2018-01-08 08:46:02 -08:00 committed by GitHub
commit e57055c7cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/rgw/rgw_acl_s3.cc
View File

@ -454,14 +454,17 @@ static const s3_acl_header acl_header_perms[] = {
int RGWAccessControlPolicy_S3::create_from_headers(RGWRados *store, const RGWEnv *env, ACLOwner& _owner)
{
std::list<ACLGrant> grants;
int r = 0;
for (const struct s3_acl_header *p = acl_header_perms; p->rgw_perm; p++) {
if (parse_acl_header(store, env, p, grants) < 0)
return false;
r = parse_acl_header(store, env, p, grants);
if (r < 0) {
return r;
}
}
RGWAccessControlList_S3& _acl = static_cast<RGWAccessControlList_S3 &>(acl);
int r = _acl.create_from_grants(grants);
r = _acl.create_from_grants(grants);
owner = _owner;