From bb5d3d58bfcae96d2e5f796eaa74fc0987f79e77 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Fri, 16 Oct 2020 11:33:32 +0200 Subject: [PATCH] msg/async/ProtocolV1: resurrect "include MGR as service when applying cephx settings" This was added in commit 0ec7d6bbc4af ("msg/async,simple: include MGR as service when applying cephx settings") and inadvertently dropped in commit e6f043f7d2dc ("msgr/async: huge refactoring of protocol V1"). As a result, mgr daemons are miscategorized as clients when enforcing cephx_*require_signatures options. Signed-off-by: Ilya Dryomov (cherry picked from commit 949e2e595eda553aa68f697cee1dcfff3c09cf3f) --- src/msg/async/ProtocolV1.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/msg/async/ProtocolV1.cc b/src/msg/async/ProtocolV1.cc index e7c6295c14f2f..f61ee1af03e68 100644 --- a/src/msg/async/ProtocolV1.cc +++ b/src/msg/async/ProtocolV1.cc @@ -1936,7 +1936,8 @@ CtPtr ProtocolV1::handle_connect_message_2() { // require signatures for cephx? if (connect_msg.authorizer_protocol == CEPH_AUTH_CEPHX) { if (connection->peer_type == CEPH_ENTITY_TYPE_OSD || - connection->peer_type == CEPH_ENTITY_TYPE_MDS) { + connection->peer_type == CEPH_ENTITY_TYPE_MDS || + connection->peer_type == CEPH_ENTITY_TYPE_MGR) { if (cct->_conf->cephx_require_signatures || cct->_conf->cephx_cluster_require_signatures) { ldout(cct, 10) -- 2.39.5