rgw: merge related fixes

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

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index b0c2369cb7699240384fb56283a068812e9a007f..63ebd03d55ee82910ee3e690f3d3c2a53e883cfc 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -1303,7 +1303,8 @@ static int send_to_remote_gateway(const string& remote, req_info& info,
     }
     conn = iter->second;
   }
-  int ret = conn->forward("", info, NULL, MAX_REST_RESPONSE, &in_data, &response);
+  rgw_user user;
+  int ret = conn->forward(user, info, NULL, MAX_REST_RESPONSE, &in_data, &response);
   if (ret < 0) {
     return ret;
   }