mon: Use MonCaps::check_privileges instead of a macro for MSG_MON_COMMANDs.

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index d994c220b54f95bd8db3f7eb7b93fb128d80fa72..6ee5a31dad82a7000ec0e1546800e8b6adce9a62 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -258,6 +258,11 @@ void Monitor::handle_command(MMonCommand *m)
     return;
   }
 
+  if (!m->caps->check_privileges(PAXOS_MONMAP, MON_CAP_ALL)) {
+    string rs="Access denied";
+    reply_command((MMonCommand *)m, -EACCES, rs, 0);
+  }
+
   dout(0) << "handle_command " << *m << dendl;
   bufferlist rdata;
   string rs;
@@ -603,11 +608,6 @@ do { \
       break;
 
     case MSG_MON_COMMAND:
-      if (IS_NOT_ADMIN) {
-        string rs="Access denied";
-        reply_command((MMonCommand *)m, -EACCES, rs, 0);
-        EXIT_NOT_ADMIN;
-      }
       fill_caps(m);
       handle_command((MMonCommand*)m);
       break;