From 298073f5f37b97533cf0d2f03ad2ab481d771085 Mon Sep 17 00:00:00 2001
From: Greg Farnum <gregf@hq.newdream.net>
Date: Mon, 22 Mar 2010 15:47:21 -0700
Subject: [PATCH] mon: don't use macros in evaluating MSG_MON_PAXOS messages

---
 src/mon/Monitor.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index d0570e593d920..ff0af83e97786 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -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;
 
-- 
2.39.5