]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osdcaps: allow the default UID to have full caps on its own pools.
authorGreg Farnum <gregory.farnum@dreamhost.com>
Tue, 2 Aug 2011 20:12:24 +0000 (13:12 -0700)
committerGreg Farnum <gregory.farnum@dreamhost.com>
Thu, 4 Aug 2011 15:39:08 +0000 (08:39 -0700)
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>
src/osd/OSDCaps.cc

index c3f0a40f3d8b65dff8b5e0d840bcd95c5d9ad06b..8814e9f02e7dc494e4920417b3968422d2f6632a 100644 (file)
@@ -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;
   }