msg/simple: remove get_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 0b59bdcfaf7c4aa6452aeaf345fb6e6fbf292519..f0465e25f7693841b8c7429610f017d3d8fed6af 100644 (file)
--- a/src/msg/simple/Pipe.cc
+++ b/src/msg/simple/Pipe.cc
@@ -1148,7 +1148,7 @@ int Pipe::connect()
 
   while (1) {
     if (!authorizer) {
-      authorizer = msgr->get_authorizer(peer_type, false);
+      authorizer = msgr->ms_deliver_get_authorizer(peer_type, false);
     }
     bufferlist authorizer_reply;
 
@@ -1265,7 +1265,7 @@ int Pipe::connect()
       got_bad_auth = true;
       pipe_lock.Unlock();
       delete authorizer;
-      authorizer = msgr->get_authorizer(peer_type, true);  // try harder
+      authorizer = msgr->ms_deliver_get_authorizer(peer_type, true);
       continue;
     }
     if (reply.tag == CEPH_MSGR_TAG_RESETSESSION) {

diff --git a/src/msg/simple/SimpleMessenger.cc b/src/msg/simple/SimpleMessenger.cc
index 26e05a8f60a0f60997d4b197f637cbf132652521..6c33295f0cf18e6bb14cc61dbaa456702025f241 100644 (file)
--- a/src/msg/simple/SimpleMessenger.cc
+++ b/src/msg/simple/SimpleMessenger.cc
@@ -425,11 +425,6 @@ Pipe *SimpleMessenger::connect_rank(const entity_addr_t& addr,
 
 
 
-AuthAuthorizer *SimpleMessenger::get_authorizer(int peer_type, bool force_new)
-{
-  return ms_deliver_get_authorizer(peer_type, force_new);
-}
-
 bool SimpleMessenger::verify_authorizer(Connection *con, int peer_type,
                                        int protocol, bufferlist& authorizer, bufferlist& authorizer_reply,
                                        bool& isvalid,CryptoKey& session_key,

diff --git a/src/msg/simple/SimpleMessenger.h b/src/msg/simple/SimpleMessenger.h
index d899ba31d2c7a384e9e1e76363941b26cbd1c5e2..b0322711e08b9bc0bdd79bace4d71c6c8fff4097 100644 (file)
--- a/src/msg/simple/SimpleMessenger.h
+++ b/src/msg/simple/SimpleMessenger.h
@@ -351,10 +351,6 @@ public:
    * @{
    */
 
-  /**
-   * This wraps ms_deliver_get_authorizer. We use it for Pipe.
-   */
-  AuthAuthorizer *get_authorizer(int peer_type, bool force_new);
   /**
    * This wraps ms_deliver_verify_authorizer; we use it for Pipe.
    */