From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 21 Oct 2024 16:23:51 +0000 (-0400)
Subject: radosgw-admin: allow 'sync group pipe modify' with existing user
X-Git-Tag: v19.2.3~276^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1706d3c6da2442b445b139caef0e72015ce5119c;p=ceph.git

radosgw-admin: allow 'sync group pipe modify' with existing user

Fixes: https://tracker.ceph.com/issues/68645

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 64f252c24015df6e652601769cb6f6e5d4da10ca)
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 7bdd0544899a..a0c0c46d439f 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -10316,7 +10316,8 @@ next:
 
     if (!rgw::sal::User::empty(user)) {
       pipe->params.user = user->get_id();
-    } else if (pipe->params.mode == rgw_sync_pipe_params::MODE_USER) {
+    } else if (pipe->params.mode == rgw_sync_pipe_params::MODE_USER &&
+               pipe->params.user.empty()) {
       cerr << "ERROR: missing --uid for --mode=user" << std::endl;
       return EINVAL;
     }