From: Sage Weil <sage@redhat.com>
Date: Thu, 20 Sep 2018 21:19:15 +0000 (-0500)
Subject: msg/async: drop verify_authorizer wrapper
X-Git-Tag: v14.0.1~26^2~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a5f929553740cb41d46e6a80fec55e001b75e9c5;p=ceph-ci.git

msg/async: drop verify_authorizer wrapper

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/msg/async/AsyncMessenger.h b/src/msg/async/AsyncMessenger.h
index bc6b5cc56a2..3f2333b9500 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<AuthAuthorizerChallenge> *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 0dcb147b1ad..f3c3d4bae8e 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) ||