]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/net: fix compile errors 24629/head
authorYingxin <yingxin.cheng@intel.com>
Wed, 17 Oct 2018 15:12:45 +0000 (23:12 +0800)
committerYingxin <yingxin.cheng@intel.com>
Wed, 17 Oct 2018 15:12:45 +0000 (23:12 +0800)
test_alien_echo.cc is using common_init_finish, but it is not available
if defined WITH_SEASTAR.

Dispatcher::ms_verify_authorizer() is removed by PR#24095.

Signed-off-by: Yingxin <yingxin.cheng@intel.com>
src/common/common_init.h
src/test/crimson/test_alien_echo.cc

index 5a19d44ca924a52cc865867e055ab0a32bc6c6f4..a2c3dd84fd62b6bb80fd1423f3468c3c2a2d18b9 100644 (file)
@@ -69,7 +69,6 @@ CephContext *common_preinit(const CephInitParameters &iparams,
 void complain_about_parse_errors(CephContext *cct,
                                 std::deque<std::string> *parse_errors);
 
-#ifndef WITH_SEASTAR
 /* This function is called after you have done your last
  * fork. When you make this call, the system will initialize everything that
  * cannot be initialized before a fork.
@@ -83,6 +82,5 @@ void complain_about_parse_errors(CephContext *cct,
  * the Ceph libraries would be destroyed by a fork().
  */
 void common_init_finish(CephContext *cct);
-#endif // #ifndef WITH_SEASTAR
 
 #endif
index 50a4d52e9dc3d552cbc7f90b3822998a68108c0d..51e009145c70cba6c8ecd709940a5cb5ab484196 100644 (file)
@@ -133,14 +133,6 @@ struct Server {
       }
       on_reply.notify_one();
     }
-    bool ms_verify_authorizer(Connection *con, int peer_type, int protocol,
-                              bufferlist& authorizer,
-                              bufferlist& authorizer_reply,
-                              bool& isvalid, CryptoKey& session_key,
-                              std::unique_ptr<AuthAuthorizerChallenge>*) override {
-      isvalid = true;
-      return true;
-    }
     bool ms_dispatch(Message*) override {
       ceph_abort();
     }
@@ -196,14 +188,6 @@ struct Client {
       }
       on_reply.notify_one();
     }
-    bool ms_verify_authorizer(Connection *con, int peer_type, int protocol,
-                              bufferlist& authorizer,
-                              bufferlist& authorizer_reply,
-                              bool& isvalid, CryptoKey& session_key,
-                              std::unique_ptr<AuthAuthorizerChallenge>*) override {
-      isvalid = true;
-      return true;
-    }
     bool ms_dispatch(Message*) override {
       ceph_abort();
     }