Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mimic: rgw: conditionally allow builtin users with non-unique email addresses #28716

Merged
merged 1 commit into from Jul 8, 2019

Conversation

@smithfarm
Copy link
Contributor

smithfarm commented Jun 24, 2019

@smithfarm smithfarm self-assigned this Jun 24, 2019
@smithfarm smithfarm added this to the mimic milestone Jun 24, 2019
@smithfarm smithfarm requested a review from cbodley Jun 24, 2019
@smithfarm smithfarm added rgw and removed core labels Jun 24, 2019
@smithfarm smithfarm force-pushed the smithfarm:wip-40507-mimic branch from 7c42235 to f458df7 Jun 24, 2019
if (!user_email.empty() && !found) {
found = (rgw_get_user_info_by_email(store, user_email, user_info, &op_state.objv) >= 0);
op_state.found_by_email = found;
if (store->ctx()->_conf->rgw_user_unique_email) {

This comment has been minimized.

Copy link
@cbodley

cbodley Jun 24, 2019

Contributor

i think the correct resolution here should be:

-  if (store->ctx()->_conf.get_val<bool>("rgw_user_unique_email")) {
+  if (store->ctx()->_conf->get_val<bool>("rgw_user_unique_email")) {

This comment has been minimized.

Copy link
@smithfarm

smithfarm Jun 24, 2019

Author Contributor

Thanks

Conditionally allow non-unique email address values for builtin
RGW users.

Fixes: http://tracker.ceph.com/issues/40089

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 9747915)

Conflicts:
    src/rgw/rgw_user.cc
- changed '_conf.get_val<bool>' to '_conf->get_val<bool>'
@smithfarm smithfarm force-pushed the smithfarm:wip-40507-mimic branch from f458df7 to 478de03 Jun 24, 2019
@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Jul 1, 2019

@yuriw yuriw merged commit 4f54e2a into ceph:mimic Jul 8, 2019
4 checks passed
4 checks passed
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
@smithfarm smithfarm deleted the smithfarm:wip-40507-mimic branch Jul 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.