diff --git a/dbsim/db_simulator.cpp b/dbsim/db_simulator.cpp index 318ea47..594b847 100644 --- a/dbsim/db_simulator.cpp +++ b/dbsim/db_simulator.cpp @@ -137,7 +137,7 @@ void db::simulator::start() std::string server_options(params_.wsrep_provider_options); if (server.server_state().load_provider( - params_.wsrep_provider, server_options, false)) + params_.wsrep_provider, server_options)) { throw wsrep::runtime_error("Failed to load provider"); } diff --git a/include/wsrep/provider.hpp b/include/wsrep/provider.hpp index e2fe27a..5d50a38 100644 --- a/include/wsrep/provider.hpp +++ b/include/wsrep/provider.hpp @@ -384,8 +384,7 @@ namespace wsrep static provider* make_provider( wsrep::server_state&, const std::string& provider_spec, - const std::string& provider_options, - bool encrypt); + const std::string& provider_options); protected: wsrep::server_state& server_state_; }; diff --git a/include/wsrep/server_state.hpp b/include/wsrep/server_state.hpp index 3fe5b29..9dda7d5 100644 --- a/include/wsrep/server_state.hpp +++ b/include/wsrep/server_state.hpp @@ -261,8 +261,7 @@ namespace wsrep * @return Zero on success, non-zero on error. */ int load_provider(const std::string& provider, - const std::string& provider_options, - bool encrypt); + const std::string& provider_options); void unload_provider(); diff --git a/src/provider.cpp b/src/provider.cpp index 89f0aad..6bc855b 100644 --- a/src/provider.cpp +++ b/src/provider.cpp @@ -25,13 +25,12 @@ wsrep::provider* wsrep::provider::make_provider( wsrep::server_state& server_state, const std::string& provider_spec, - const std::string& provider_options, - bool const encrypt) + const std::string& provider_options) { try { return new wsrep::wsrep_provider_v26( - server_state, provider_options, provider_spec, encrypt); + server_state, provider_options, provider_spec); } catch (const wsrep::runtime_error& e) { diff --git a/src/server_state.cpp b/src/server_state.cpp index 4258f17..2cef657 100644 --- a/src/server_state.cpp +++ b/src/server_state.cpp @@ -335,15 +335,14 @@ static int apply_toi(wsrep::provider& provider, ////////////////////////////////////////////////////////////////////////////// int wsrep::server_state::load_provider(const std::string& provider_spec, - const std::string& provider_options, - bool const encrypt) + const std::string& provider_options) { wsrep::log_info() << "Loading provider " << provider_spec << "initial position: " << initial_position_; provider_ = wsrep::provider::make_provider( - *this, provider_spec, provider_options, encrypt); + *this, provider_spec, provider_options); return (provider_ ? 0 : 1); } diff --git a/src/wsrep_provider_v26.cpp b/src/wsrep_provider_v26.cpp index 4ec2f0a..8577c31 100644 --- a/src/wsrep_provider_v26.cpp +++ b/src/wsrep_provider_v26.cpp @@ -567,8 +567,7 @@ namespace wsrep::wsrep_provider_v26::wsrep_provider_v26( wsrep::server_state& server_state, const std::string& provider_options, - const std::string& provider_spec, - bool const encrypt) + const std::string& provider_spec) : provider(server_state) , wsrep_() { @@ -592,7 +591,7 @@ wsrep::wsrep_provider_v26::wsrep_provider_v26( init_args.connected_cb = &connected_cb; init_args.view_cb = &view_cb; init_args.sst_request_cb = &sst_request_cb; - init_args.encrypt_cb = encrypt ? &encrypt_cb : NULL; + init_args.encrypt_cb = &encrypt_cb; init_args.apply_cb = &apply_cb; init_args.unordered_cb = 0; init_args.sst_donate_cb = &sst_donate_cb; diff --git a/src/wsrep_provider_v26.hpp b/src/wsrep_provider_v26.hpp index 1e1e59b..695cd40 100644 --- a/src/wsrep_provider_v26.hpp +++ b/src/wsrep_provider_v26.hpp @@ -31,7 +31,7 @@ namespace wsrep public: wsrep_provider_v26(wsrep::server_state&, const std::string&, - const std::string&, bool encrypt); + const std::string&); ~wsrep_provider_v26(); enum wsrep::provider::status connect(const std::string&, const std::string&, const std::string&,