From: Yan, Zheng <zyan@redhat.com>
Date: Thu, 11 May 2017 03:37:34 +0000 (+0800)
Subject: client: fix UserPerm::gid_in_group()
X-Git-Tag: v12.0.3~11^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3977c303378c35c7c9d6be9bb7de5a75ec17d34b;p=ceph-ci.git

client: fix UserPerm::gid_in_group()

Fixes: http://tracker.ceph.com/issues/19903
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
---

diff --git a/src/client/UserPerm.h b/src/client/UserPerm.h
index 1895c15c2d4..a2d6ccbe888 100644
--- a/src/client/UserPerm.h
+++ b/src/client/UserPerm.h
@@ -68,10 +68,10 @@ public:
 
   uid_t uid() const { return m_uid != (uid_t)-1 ? m_uid : ::geteuid(); }
   gid_t gid() const { return m_gid != (gid_t)-1 ? m_gid : ::getegid(); }
-  bool gid_in_groups(gid_t gid) const {
-    if (gid == m_gid) return true;
+  bool gid_in_groups(gid_t id) const {
+    if (id == gid()) return true;
     for (int i = 0; i < gid_count; ++i) {
-      if (gid == gids[i]) return true;
+      if (id == gids[i]) return true;
     }
     return false;
   }