From a5f929553740cb41d46e6a80fec55e001b75e9c5 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 20 Sep 2018 16:19:15 -0500 Subject: [PATCH] msg/async: drop verify_authorizer wrapper Signed-off-by: Sage Weil --- src/msg/async/AsyncMessenger.h | 9 --------- src/msg/async/Protocol.cc | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/msg/async/AsyncMessenger.h b/src/msg/async/AsyncMessenger.h index bc6b5cc56a244..3f2333b950039 100644 --- a/src/msg/async/AsyncMessenger.h +++ b/src/msg/async/AsyncMessenger.h @@ -378,15 +378,6 @@ public: return stack; } - /** - * This wraps ms_deliver_verify_authorizer; we use it for AsyncConnection. - */ - bool verify_authorizer(Connection *con, int peer_type, int protocol, bufferlist& auth, bufferlist& auth_reply, - bool& isvalid, CryptoKey& session_key, - std::unique_ptr *challenge) { - return ms_deliver_verify_authorizer(con, peer_type, protocol, auth, - auth_reply, isvalid, session_key, challenge); - } /** * Increment the global sequence for this AsyncMessenger and return it. * This is for the connect protocol, although it doesn't hurt if somebody diff --git a/src/msg/async/Protocol.cc b/src/msg/async/Protocol.cc index 0dcb147b1adf5..f3c3d4bae8eb3 100644 --- a/src/msg/async/Protocol.cc +++ b/src/msg/async/Protocol.cc @@ -1907,7 +1907,7 @@ CtPtr ProtocolV1::handle_connect_message_2() { bool authorizer_valid; bool need_challenge = HAVE_FEATURE(connect_msg.features, CEPHX_V2); bool had_challenge = (bool)authorizer_challenge; - if (!messenger->verify_authorizer( + if (!messenger->ms_deliver_verify_authorizer( connection, connection->peer_type, connect_msg.authorizer_protocol, authorizer_buf, authorizer_reply, authorizer_valid, session_key, need_challenge ? &authorizer_challenge : nullptr) || -- 2.39.5