diff options
| author | Daniel Gryniewicz <dang@redhat.com> | 2019-11-12 19:57:26 +0100 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@redhat.com> | 2020-01-17 17:01:47 +0100 |
| commit | 70ff2ab64e6c22c3fe2545de4373551e1597e552 (patch) | |
| tree | aeb0dd2f1836d287e65ff803b7ba868d1415e189 /src/rgw/librgw.cc | |
| parent | Merge pull request #32650 from votdev/fix_i18n (diff) | |
| download | ceph-70ff2ab64e6c22c3fe2545de4373551e1597e552.tar.xz ceph-70ff2ab64e6c22c3fe2545de4373551e1597e552.zip | |
Zipper - RGWUser
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
Diffstat (limited to 'src/rgw/librgw.cc')
| -rw-r--r-- | src/rgw/librgw.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc index a2f6e141f32..23e5e099180 100644 --- a/src/rgw/librgw.cc +++ b/src/rgw/librgw.cc @@ -303,7 +303,7 @@ namespace rgw { if (ret < 0) { if (s->system_request) { dout(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->get_id())) { dout(2) << "overriding permissions due to admin operation" << dendl; } else { abort_req(s, op, ret); @@ -423,7 +423,7 @@ namespace rgw { if (ret < 0) { if (s->system_request) { dout(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->get_id())) { dout(2) << "overriding permissions due to admin operation" << dendl; } else { abort_req(s, op, ret); @@ -677,8 +677,8 @@ namespace rgw { s->perm_mask = RGW_PERM_FULL_CONTROL; // populate the owner info - s->owner.set_id(s->user->user_id); - s->owner.set_name(s->user->display_name); + s->owner.set_id(s->user->get_id()); + s->owner.set_name(s->user->get_display_name()); return 0; } /* RGWHandler_Lib::authorize */ |