From: Sage Weil <sage@redhat.com>
Date: Fri, 4 May 2018 15:07:21 +0000 (-0500)
Subject: msg/async,simple: include MGR as service when applying cephx settings
X-Git-Tag: v12.2.6~3^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=22846febb239af37f9de582704abd229f374c4b4;p=ceph.git

msg/async,simple: include MGR as service when applying cephx settings

mgr is in same category as mds and osd.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 0ec7d6bbc4afd3c8d678943234222468f508f305)
---

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index 41508b42fd56..2ab23396e773 100644
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -1485,7 +1485,8 @@ ssize_t AsyncConnection::handle_connect_msg(ceph_msg_connect &connect, bufferlis
   // require signatures for cephx?
   if (connect.authorizer_protocol == CEPH_AUTH_CEPHX) {
     if (peer_type == CEPH_ENTITY_TYPE_OSD ||
-        peer_type == CEPH_ENTITY_TYPE_MDS) {
+        peer_type == CEPH_ENTITY_TYPE_MDS ||
+	peer_type == CEPH_ENTITY_TYPE_MGR) {
       if (async_msgr->cct->_conf->cephx_require_signatures ||
           async_msgr->cct->_conf->cephx_cluster_require_signatures) {
         ldout(async_msgr->cct, 10) << __func__ << " using cephx, requiring MSG_AUTH feature bit for cluster" << dendl;
diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc
index 848efd45c009..f2bd57bf26ce 100644
--- a/src/msg/simple/Pipe.cc
+++ b/src/msg/simple/Pipe.cc
@@ -477,7 +477,8 @@ int Pipe::accept()
     // require signatures for cephx?
     if (connect.authorizer_protocol == CEPH_AUTH_CEPHX) {
       if (peer_type == CEPH_ENTITY_TYPE_OSD ||
-	  peer_type == CEPH_ENTITY_TYPE_MDS) {
+	  peer_type == CEPH_ENTITY_TYPE_MDS ||
+	  peer_type == CEPH_ENTITY_TYPE_MGR) {
 	if (msgr->cct->_conf->cephx_require_signatures ||
 	    msgr->cct->_conf->cephx_cluster_require_signatures) {
 	  ldout(msgr->cct,10) << "using cephx, requiring MSG_AUTH feature bit for cluster" << dendl;