From 53029941badbcfdde04ad92d56ba55f9ea651089 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Tue, 9 Mar 2010 16:42:29 -0800 Subject: [PATCH] Revert "mon: add check_privileges function to OSDMon." Deprecated by the existence of MonCaps::check_privileges This reverts commit 07df67f3948e50a24365e0936bd0de3c7dc1a1f2. --- src/mon/OSDMonitor.cc | 10 ---------- src/mon/OSDMonitor.h | 3 --- 2 files changed, 13 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 1f1b54af5e11b..50b6e92d6ee90 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -1403,13 +1403,3 @@ void OSDMonitor::_pool_op(MPoolOp *m, int replyCode, epoch_t epoch) mon->send_reply(m, reply); delete m; } - -//for now, this just checks against allow_all, auid equaling caps.auid, -//or auid being default public -bool OSDMonitor::check_privileges(__u64 auid, MonCaps& caps, int req_perm) -{ - if (caps.allow_all) return true; - if (CEPH_AUTH_UID_DEFAULT == auid) return true; - if (auid == caps.auid) return true; - return false; -} diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h index a88a699964a58..7cebb90b65b1d 100644 --- a/src/mon/OSDMonitor.h +++ b/src/mon/OSDMonitor.h @@ -93,9 +93,6 @@ private: int prepare_new_pool(MPoolOp *m); void _pool_op(MPoolOp *m, int replyCode, epoch_t epoch); - //check that the provided caps allow the given action in auid's name - bool check_privileges(__u64 auid, MonCaps& caps, int req_perm); - struct C_Booted : public Context { OSDMonitor *cmon; MOSDBoot *m; -- 2.39.5