Skip to content

Commit

Permalink
Merge pull request ceph#7279 from zaitcev/wip-5073-subuser
Browse files Browse the repository at this point in the history
rgw: Parse --subuser better

Reviewed-by: Yehuda Sadeh <[email protected]>
  • Loading branch information
yehudasa committed Jan 20, 2016
2 parents 65a3fde + a51fbf2 commit e5585bc
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/rgw/rgw_user.h
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,8 @@ struct RGWUserAdminOpState {
return;

size_t pos = _subuser.find(":");

if (pos != string::npos) {
user_id.id = _subuser.substr(0, pos);
user_id.from_str(_subuser.substr(0, pos));
subuser = _subuser.substr(pos+1);
} else {
subuser = _subuser;
Expand Down

0 comments on commit e5585bc

Please sign in to comment.