From: Yehuda Sadeh <yehuda@inktank.com>
Date: Tue, 1 Apr 2014 23:02:15 +0000 (-0700)
Subject: radosgw-admin: don't always generate access key for subusers
X-Git-Tag: v0.80-rc1~58^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c09f58ef81db9f6dbd528b2aa4c2f135aa6d262e;p=ceph.git

radosgw-admin: don't always generate access key for subusers

Only generate key for subuser if one was not specified for it, and only
when creating a subuser.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index a4c56dc7647..23575d8a0cb 100644
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -1228,6 +1228,10 @@ int RGWSubUserPool::add(RGWUserAdminOpState& op_state, std::string *err_msg, boo
     return ret;
   }
 
+  if (op_state.get_secret_key().empty()) {
+    op_state.set_gen_access();
+  }
+
   ret = execute_add(op_state, &subprocess_msg, defer_user_update);
   if (ret < 0) {
     set_err_msg(err_msg, "unable to create subuser, " + subprocess_msg);
diff --git a/src/rgw/rgw_user.h b/src/rgw/rgw_user.h
index 3cd08d30c77..af99ed58939 100644
--- a/src/rgw/rgw_user.h
+++ b/src/rgw/rgw_user.h
@@ -233,7 +233,6 @@ struct RGWUserAdminOpState {
     }
 
     subuser_specified = true;
-    gen_access = true;
   }
   void set_caps(std::string& _caps) {
     if (_caps.empty())