From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Thu, 2 Jun 2016 16:55:09 +0000 (+0200)
Subject: rgw: skip printing ACLOwner in Swift's account ACLs.
X-Git-Tag: v11.0.0~283^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aeddb4af19951e15044f6dbc476c1d38d8787b82;p=ceph.git

rgw: skip printing ACLOwner in Swift's account ACLs.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
---

diff --git a/src/rgw/rgw_acl.h b/src/rgw/rgw_acl.h
index fb02758f06f7..7ca2ce89a0f5 100644
--- a/src/rgw/rgw_acl.h
+++ b/src/rgw/rgw_acl.h
@@ -357,6 +357,7 @@ public:
   void set_name(const string& name) { display_name = name; }
 
   rgw_user& get_id() { return id; }
+  const rgw_user& get_id() const { return id; }
   string& get_display_name() { return display_name; }
 };
 WRITE_CLASS_ENCODER(ACLOwner)
diff --git a/src/rgw/rgw_acl_swift.cc b/src/rgw/rgw_acl_swift.cc
index 4cd51469409e..71121a45a057 100644
--- a/src/rgw/rgw_acl_swift.cc
+++ b/src/rgw/rgw_acl_swift.cc
@@ -301,6 +301,8 @@ void RGWAccessControlPolicy_SWIFTAcct::to_str(std::string& acl_str) const
         continue;
       }
       id = SWIFT_GROUP_ALL_USERS;
+    } else if (owner.get_id() == id) {
+      continue;
     }
 
     if (SWIFT_PERM_ADMIN == (perm & SWIFT_PERM_ADMIN)) {