From: Ricardo Dias <rdias@suse.com>
Date: Tue, 12 Feb 2019 13:46:19 +0000 (+0000)
Subject: mon: mons also connect to mgrs
X-Git-Tag: v14.1.0~144^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F26385%2Fhead;p=ceph.git

mon: mons also connect to mgrs

Signed-off-by: Ricardo Dias <rdias@suse.com>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 666eeacce375..bd7ab12932bd 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -5875,7 +5875,8 @@ int Monitor::get_auth_request(
   bufferlist *out)
 {
   std::scoped_lock l(auth_lock);
-  if (con->get_peer_type() != CEPH_ENTITY_TYPE_MON) {
+  if (con->get_peer_type() != CEPH_ENTITY_TYPE_MON &&
+      con->get_peer_type() != CEPH_ENTITY_TYPE_MGR) {
     return -EACCES;
   }
   AuthAuthorizer *auth;
@@ -5883,7 +5884,7 @@ int Monitor::get_auth_request(
     return -EACCES;
   }
   auth_meta->authorizer.reset(auth);
-  auth_registry.get_supported_modes(CEPH_ENTITY_TYPE_MON,
+  auth_registry.get_supported_modes(con->get_peer_type(),
 				    auth->protocol,
 				    preferred_modes);
   *method = auth->protocol;