From 89ffece49097d5eaa8fd798e4e2b6c74996f1787 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 23 Sep 2019 13:48:06 -0500 Subject: [PATCH] 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 --- src/msg/async/ProtocolV1.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/msg/async/ProtocolV1.cc b/src/msg/async/ProtocolV1.cc index 1911d31e7e28..06771d0de5b8 100644 --- 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 = -- 2.47.3