From: Sage Weil <sage@redhat.com>
Date: Wed, 19 Sep 2018 15:52:45 +0000 (-0500)
Subject: msg/simple: remove verify_authorizer wrapper
X-Git-Tag: v14.0.1~26^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e91fd88b9263b2b33dc84dc41f14007aa7980ae1;p=ceph.git

msg/simple: remove verify_authorizer wrapper

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

diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc
index f0465e25f7693..555fc70a39838 100644
--- a/src/msg/simple/Pipe.cc
+++ b/src/msg/simple/Pipe.cc
@@ -523,7 +523,7 @@ int Pipe::accept()
     need_challenge = HAVE_FEATURE(connect.features, CEPHX_V2);
     had_challenge = (bool)authorizer_challenge;
     authorizer_reply.clear();
-    if (!msgr->verify_authorizer(
+    if (!msgr->ms_deliver_verify_authorizer(
 	  connection_state.get(), peer_type, connect.authorizer_protocol, authorizer,
 	  authorizer_reply, authorizer_valid, session_key,
 	  need_challenge ? &authorizer_challenge : nullptr) ||
diff --git a/src/msg/simple/SimpleMessenger.cc b/src/msg/simple/SimpleMessenger.cc
index 6c33295f0cf18..aa39bd5e27c07 100644
--- a/src/msg/simple/SimpleMessenger.cc
+++ b/src/msg/simple/SimpleMessenger.cc
@@ -425,16 +425,6 @@ Pipe *SimpleMessenger::connect_rank(const entity_addr_t& addr,
 
 
 
-bool SimpleMessenger::verify_authorizer(Connection *con, int peer_type,
-					int protocol, bufferlist& authorizer, bufferlist& authorizer_reply,
-					bool& isvalid,CryptoKey& session_key,
-					std::unique_ptr<AuthAuthorizerChallenge> *challenge)
-{
-  return ms_deliver_verify_authorizer(con, peer_type, protocol, authorizer, authorizer_reply,
-				      isvalid, session_key,
-				      challenge);
-}
-
 ConnectionRef SimpleMessenger::connect_to(int type,
 					  const entity_addrvec_t& addrs)
 {
diff --git a/src/msg/simple/SimpleMessenger.h b/src/msg/simple/SimpleMessenger.h
index b0322711e08b9..6acdeb138be26 100644
--- a/src/msg/simple/SimpleMessenger.h
+++ b/src/msg/simple/SimpleMessenger.h
@@ -351,13 +351,6 @@ public:
    * @{
    */
 
-  /**
-   * This wraps ms_deliver_verify_authorizer; we use it for Pipe.
-   */
-  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);
   /**
    * Increment the global sequence for this SimpleMessenger and return it.
    * This is for the connect protocol, although it doesn't hurt if somebody