rgw/s3: remove local variable 'uri' that shadows member variable

fixes "Invalid group uri" errors from `s3cmd setacl --acl-public s3://bucketname`
introduced by account changes for squid

Fixes: https://tracker.ceph.com/issues/69527
Reported-by: Yixin Jin <yjin@akamai.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 4257d11936cfcf0c96e6fabda72514236bbeeb4a)

diff --git a/src/rgw/rgw_acl_s3.cc b/src/rgw/rgw_acl_s3.cc
index 133a7afd2c95dda580af9911676ed8055b39ed8f..45df1bff9ff530f21159e47cf24fb936fa1c2013 100644 (file)
--- a/src/rgw/rgw_acl_s3.cc
+++ b/src/rgw/rgw_acl_s3.cc
@@ -200,7 +200,6 @@ bool ACLGrant_S3::xml_end(const char *el) {
   ACLURI_S3 *acl_uri;
   ACLEmail_S3 *acl_email;
   ACLDisplayName_S3 *acl_name;
-  string uri;
 
   acl_grantee = static_cast<ACLGrantee_S3 *>(find_first("Grantee"));
   if (!acl_grantee)