From: Pete Zaitcev <zaitcev@kotori.zaitcev.us>
Date: Tue, 19 Jan 2016 06:44:42 +0000 (-0700)
Subject: rgw: Parse --subuser better
X-Git-Tag: v10.0.3~18^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7279%2Fhead;p=ceph.git

rgw: Parse --subuser better

This fixes a funny message "ERROR: 'tenant$user != tenant$user'"
in case --subuser='tenant$user' is supplied.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
---

diff --git a/src/rgw/rgw_user.h b/src/rgw/rgw_user.h
index a521c8675d75..57d40faaf306 100644
--- a/src/rgw/rgw_user.h
+++ b/src/rgw/rgw_user.h
@@ -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;