From: Sage Weil <sage@newdream.net>
Date: Wed, 8 Jun 2011 21:55:00 +0000 (-0700)
Subject: mon: weaken pool creation caps check
X-Git-Tag: v0.29.1~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6069fa6a55e81e4a2ea48e1528ed4f1ec4ab0f49;p=ceph.git

mon: weaken pool creation caps check

Allow a pool creation if we specify an auid but are allowed to create
buckets as anybody.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 6ccaeefe4ac..ea205aaafb2 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1880,8 +1880,8 @@ bool OSDMonitor::preprocess_pool_op_create ( MPoolOp *m)
     _pool_op(m, -EPERM, pending_inc.epoch);
     return true;
   }
-  if ((m->auid && !session->caps.check_privileges(PAXOS_OSDMAP, MON_CAP_W, m->auid)) ||
-      (!m->auid && !session->caps.check_privileges(PAXOS_OSDMAP, MON_CAP_W))) {
+  if ((m->auid && !session->caps.check_privileges(PAXOS_OSDMAP, MON_CAP_W, m->auid)) &&
+      !session->caps.check_privileges(PAXOS_OSDMAP, MON_CAP_W)) {
     if (session)
       dout(5) << "attempt to create new pool without sufficient auid privileges!"
 	      << "message: " << *m  << std::endl