From: Sage Weil <sage@inktank.com>
Date: Wed, 23 May 2012 20:49:40 +0000 (-0700)
Subject: mon: drop redundant get_allow_all() cap check
X-Git-Tag: v0.48argonaut~151^2~27^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=18af8137ce50e9014022ed6b38ad8c221eb44dfc;p=ceph.git

mon: drop redundant get_allow_all() cap check

check_privileges() already does this.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 426892e4e2b33..e882f732b57be 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1156,8 +1156,7 @@ void Monitor::handle_command(MMonCommand *m)
       return;
     }
     if (m->cmd[0] == "log") {
-      if (!session->caps.get_allow_all() &&
-	  !session->caps.check_privileges(PAXOS_MONMAP, MON_CAP_R) &&
+      if (!session->caps.check_privileges(PAXOS_MONMAP, MON_CAP_R) &&
 	  !_allowed_command(session, m->cmd)) {
 	r = -EACCES;
 	rs = "access denied";
@@ -1213,8 +1212,7 @@ void Monitor::handle_command(MMonCommand *m)
       return;
     }
     if (m->cmd[0] == "status") {
-      if (!session->caps.get_allow_all() &&
-	  !session->caps.check_privileges(PAXOS_MONMAP, MON_CAP_R) &&
+      if (!session->caps.check_privileges(PAXOS_MONMAP, MON_CAP_R) &&
 	  !_allowed_command(session, m->cmd)) {
 	r = -EACCES;
 	rs = "access denied";
@@ -1233,8 +1231,7 @@ void Monitor::handle_command(MMonCommand *m)
       r = 0;
     }
     if (m->cmd[0] == "quorum_status") {
-      if (!session->caps.get_allow_all() &&
-	  !session->caps.check_privileges(PAXOS_MONMAP, MON_CAP_R) &&
+      if (!session->caps.check_privileges(PAXOS_MONMAP, MON_CAP_R) &&
 	  !_allowed_command(session, m->cmd)) {
 	r = -EACCES;
 	rs = "access denied";
@@ -1252,8 +1249,7 @@ void Monitor::handle_command(MMonCommand *m)
       r = 0;
     }
     if (m->cmd[0] == "mon_status") {
-      if (!session->caps.get_allow_all() &&
-	  !session->caps.check_privileges(PAXOS_MONMAP, MON_CAP_R) &&
+      if (!session->caps.check_privileges(PAXOS_MONMAP, MON_CAP_R) &&
 	  !_allowed_command(session, m->cmd)) {
 	r = -EACCES;
 	rs = "access denied";
@@ -1265,8 +1261,7 @@ void Monitor::handle_command(MMonCommand *m)
       r = 0;
     }
     if (m->cmd[0] == "health") {
-      if (!session->caps.get_allow_all() &&
-	  !session->caps.check_privileges(PAXOS_MONMAP, MON_CAP_R) &&
+      if (!session->caps.check_privileges(PAXOS_MONMAP, MON_CAP_R) &&
 	  !_allowed_command(session, m->cmd)) {
 	r = -EACCES;
 	rs = "access denied";