rgw-admin: fix user_id initialization

broken due to rebase

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

2 files changed, 5 insertions, 1 deletions

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index d5f53ee9807..f818a8b8449 100644
--- 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 85798189d98..028ac038909 100644
--- 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;