From b9a04409aacd5cb9baa9ee5b4ac4e5db767932dc Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 26 Apr 2019 13:07:31 -0500 Subject: [PATCH] msg/async/ProtocolV1: generate authorizer for mon to mon connections Signed-off-by: Sage Weil --- src/msg/async/ProtocolV1.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/msg/async/ProtocolV1.cc b/src/msg/async/ProtocolV1.cc index 4647b3e1fe1..10c99bebd31 100644 --- a/src/msg/async/ProtocolV1.cc +++ b/src/msg/async/ProtocolV1.cc @@ -1444,7 +1444,8 @@ CtPtr ProtocolV1::send_connect_message() bufferlist auth_bl; vector preferred_modes; - if (connection->peer_type != CEPH_ENTITY_TYPE_MON) { + if (connection->peer_type != CEPH_ENTITY_TYPE_MON || + messenger->get_myname().type() == CEPH_ENTITY_TYPE_MON) { if (authorizer_more.length()) { ldout(cct,10) << __func__ << " using augmented (challenge) auth payload" << dendl; @@ -1575,7 +1576,8 @@ CtPtr ProtocolV1::handle_connect_reply_auth(char *buffer, int r) { bufferlist authorizer_reply; authorizer_reply.append(buffer, connect_reply.authorizer_len); - if (connection->peer_type != CEPH_ENTITY_TYPE_MON) { + if (connection->peer_type != CEPH_ENTITY_TYPE_MON || + messenger->get_myname().type() == CEPH_ENTITY_TYPE_MON) { auto am = auth_meta; bool more = (connect_reply.tag == CEPH_MSGR_TAG_CHALLENGE_AUTHORIZER); bufferlist auth_retry_bl; -- 2.39.5