From: Greg Farnum <gregory.farnum@dreamhost.com>
Date: Tue, 2 Aug 2011 20:12:24 +0000 (-0700)
Subject: osdcaps: allow the default UID to have full caps on its own pools.
X-Git-Tag: v0.34~104^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9bdc43fac3d926cb3960573b28f210731c91443c;p=ceph.git

osdcaps: allow the default UID to have full caps on its own pools.

The explicit skip in the check was just a wrongheaded attempt to
stay secure, I think.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
---

diff --git a/src/osd/OSDCaps.cc b/src/osd/OSDCaps.cc
index c3f0a40f3d8b..8814e9f02e7d 100644
--- a/src/osd/OSDCaps.cc
+++ b/src/osd/OSDCaps.cc
@@ -244,8 +244,7 @@ int OSDCaps::get_pool_cap(string& pool_name, uint64_t uid)
   pools_map.apply_caps(pool_name, explicit_cap);
 
   //owner gets full perms by default:
-  if (uid != CEPH_AUTH_UID_DEFAULT
-      && uid == auid
+  if (uid == auid
       && explicit_cap == 0) {
     explicit_cap = OSD_POOL_CAP_ALL;
   }