From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Wed, 18 Apr 2012 22:45:09 +0000 (-0700)
Subject: rgw: allow subuser creation on radosgw-admin user create
X-Git-Tag: v0.46~53
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aab516da7f89310445be4e4fb61836084d2dac32;p=ceph.git

rgw: allow subuser creation on radosgw-admin user create

This fixes issue #2312: allow the creation of both user
and a subuser in a single radosgw-admin command.

Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 692f2f83fec7..4c70feb31bed 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -744,7 +744,7 @@ int main(int argc, char **argv)
     map<string, RGWSubUser>::iterator iter = info.subusers.find(subuser);
     subuser_found = (iter != info.subusers.end());
 
-    if (!subuser_found && opt_cmd != OPT_SUBUSER_CREATE) {
+    if (!subuser_found && opt_cmd != OPT_SUBUSER_CREATE && opt_cmd != OPT_USER_CREATE) {
       cerr << "subuser specified but was not found, aborting" << std::endl;
       return 1;
     }