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 41508b42fd56c57575eb8d7dc603e2e70b89bf40..2ab23396e7738b54be35bb7b5d8925c1bf77eba9 100644 (file)
--- 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 848efd45c0090f2381a930d11a6aae1014ed6572..f2bd57bf26ce5151181c7257c8a76784007e0bea 100644 (file)
--- 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;