msg/async/ProtocolV1: require CEPHX_V2 if cephx_service_require_version >= 2

If we require this feature, a client missing it will get back the
FEATURES tag error at the msgr level, and needs_challenge below
will be true.

Fixes: https://tracker.ceph.com/issues/40716 (for nautilus msgr v1)
Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/msg/async/ProtocolV1.cc b/src/msg/async/ProtocolV1.cc
index 1911d31e7e28746a8e0249a0920b80ed726301a4..06771d0de5b8b593e7bf0bab4c136cf210405f09 100644 (file)
--- a/src/msg/async/ProtocolV1.cc
+++ b/src/msg/async/ProtocolV1.cc
@@ -1927,6 +1927,9 @@ CtPtr ProtocolV1::handle_connect_message_2() {
         connection->policy.features_required |= CEPH_FEATURE_MSG_AUTH;
       }
     }
+    if (cct->_conf->cephx_service_require_version >= 2) {
+      connection->policy.features_required |= CEPH_FEATURE_CEPHX_V2;
+    }
   }
 
   uint64_t feat_missing =