rgw-admin: fix user_id initialization

broken due to rebase

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

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index d5f53ee9807d398c4a1288b2422f45eff95dfe1b..f818a8b844964d92d3ae6fd9dc2bcf3a63487dbb 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -974,6 +974,11 @@ int main(int argc, char **argv)
     return 0;
   }
 
+  if (!user_id.empty()) {
+    user_op.set_user_id(user_id);
+    bucket_op.set_user_id(user_id);
+  }
+
   if (!display_name.empty())
     user_op.set_display_name(display_name);
 

diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index 85798189d980535594a2d070b8fbcd6660bc8db3..028ac038909e70bc37a656950e7ee4b5e27d0c56 100644 (file)
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -1409,7 +1409,6 @@ RGWUser::RGWUser() : caps(this), keys(this), subusers(this)
 int RGWUser::init(RGWRados *storage, RGWUserAdminOpState& op_state)
 {
   init_default();
-
   int ret = init_storage(storage);
   if (ret < 0)
     return ret;