From 09b1c44f279f7eb010aa8782d423a3ebdec509a5 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 1 Feb 2019 06:38:39 -0600 Subject: [PATCH] crimson: fix build Signed-off-by: Sage Weil --- src/crimson/mon/MonClient.cc | 8 ++++++-- src/test/crimson/test_alien_echo.cc | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/crimson/mon/MonClient.cc b/src/crimson/mon/MonClient.cc index c139adba7a7f4..0ce65a5cfc79a 100644 --- a/src/crimson/mon/MonClient.cc +++ b/src/crimson/mon/MonClient.cc @@ -169,7 +169,9 @@ seastar::future Connection::do_auth() conn->get_peer_addr(), *m, m->result); reply = decltype(reply){}; auto p = m->result_bl.cbegin(); - auto ret = auth->handle_response(m->result, p); + auto ret = auth->handle_response(m->result, p, +#warning fix crimson: session_key, connection_secret + nullptr, nullptr); if (ret != 0 && ret != -EAGAIN) { throw std::system_error(make_error_code( ceph::net::error::negotiation_failure)); @@ -193,7 +195,9 @@ Connection::authenticate(epoch_t epoch, auth = create_auth(m, name, want_keys); global_id = m->global_id; switch (auto p = m->result_bl.cbegin(); - auth->handle_response(m->result, p)) { + auth->handle_response(m->result, p, +#warning fix crimson: session_key, connection_secret + nullptr, nullptr)) { case 0: // none return seastar::now(); diff --git a/src/test/crimson/test_alien_echo.cc b/src/test/crimson/test_alien_echo.cc index 4492f9639acff..d58b2c94e6d80 100644 --- a/src/test/crimson/test_alien_echo.cc +++ b/src/test/crimson/test_alien_echo.cc @@ -29,10 +29,10 @@ struct DummyAuthAuthorizer : public AuthAuthorizer { : AuthAuthorizer(CEPH_AUTH_CEPHX) {} bool verify_reply(bufferlist::const_iterator&, - CryptoKey *connection_secret) override { + std::string *connection_secret) override { return true; } - bool add_challenge(CephContext*, bufferlist&) override { + bool add_challenge(CephContext*, const bufferlist&) override { return true; } }; -- 2.39.5