rgw: unlink deleted bucket from bucket's owner

if a bucket is deleted by an admin/system user instead of its
owner, the unlink would fail and the deleted bucket remained
visible to the original owner

Fixes: http://tracker.ceph.com/issues/22248
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 4701e85a3ea72852a61a106724fa22497f3d5789)

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 42a15e3593b754306abf21f6aa6bec872b6c1a7e..758b68c02ac85f4befd4fc5fa541201de35c441d 100644 (file)
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -2307,7 +2307,7 @@ void RGWDeleteBucket::execute()
   }
 
   if (op_ret == 0) {
-    op_ret = rgw_unlink_bucket(store, s->user->user_id, s->bucket.tenant,
+    op_ret = rgw_unlink_bucket(store, s->bucket_info.owner, s->bucket.tenant,
                               s->bucket.name, false);
     if (op_ret < 0) {
       ldout(s->cct, 0) << "WARNING: failed to unlink bucket: ret=" << op_ret