From 22846febb239af37f9de582704abd229f374c4b4 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 4 May 2018 10:07:21 -0500 Subject: [PATCH] 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 (cherry picked from commit 0ec7d6bbc4afd3c8d678943234222468f508f305) --- src/msg/async/AsyncConnection.cc | 3 ++- src/msg/simple/Pipe.cc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc index 41508b42fd5..2ab23396e77 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 848efd45c00..f2bd57bf26c 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; -- 2.47.3