]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: don't use macros in evaluating MSG_MON_PAXOS messages
authorGreg Farnum <gregf@hq.newdream.net>
Mon, 22 Mar 2010 22:47:21 +0000 (15:47 -0700)
committerGreg Farnum <gregf@hq.newdream.net>
Tue, 23 Mar 2010 18:41:52 +0000 (11:41 -0700)
src/mon/Monitor.cc

index d0570e593d92001a80122ba9d3038ad7584dd432..ff0af83e977868eb8d02178ea2ae64e2708f8d29 100644 (file)
@@ -670,7 +670,12 @@ do { \
       // paxos
     case MSG_MON_PAXOS:
       {
-        ALLOW_MESSAGES_FROM(CEPH_ENTITY_TYPE_MON);
+       if (!src_is_mon && 
+           !s->caps.check_privileges(PAXOS_MONMAP, MON_CAP_X)) {
+         //can't send these!
+         delete m;
+         break;
+       }
 
        MMonPaxos *pm = (MMonPaxos*)m;