From b57bb7545e7469add03487e464945c2780aad10b Mon Sep 17 00:00:00 2001 From: Volker Birk Date: Wed, 5 Aug 2020 21:49:26 +0200 Subject: [PATCH] adding the implementation of ENGINE-781 --- server/mini-adapter-impl.cc | 2 +- server/mini-adapter-main.cc | 2 +- server/session_registry.cc | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/mini-adapter-impl.cc b/server/mini-adapter-impl.cc index 48e2645..4459313 100644 --- a/server/mini-adapter-impl.cc +++ b/server/mini-adapter-impl.cc @@ -51,7 +51,7 @@ void startKeyserverLookup() if(keyserver_lookup_session) throw std::runtime_error("KeyserverLookup already started."); - PEP_STATUS status = pEp::call_with_lock(&init, &keyserver_lookup_session, pEp::CallbackDispatcher::messageToSend, ::pEp::Adapter::_inject_sync_event); + PEP_STATUS status = pEp::call_with_lock(&init, &keyserver_lookup_session, pEp::CallbackDispatcher::messageToSend, ::pEp::Adapter::_inject_sync_event, pEp::Adapter::_ensure_passphrase); if(status != PEP_STATUS_OK || keyserver_lookup_session==nullptr) { throw std::runtime_error("Cannot create keyserver lookup session! status: " + ::pEp::status_to_string(status)); diff --git a/server/mini-adapter-main.cc b/server/mini-adapter-main.cc index 31e77eb..58562b7 100644 --- a/server/mini-adapter-main.cc +++ b/server/mini-adapter-main.cc @@ -130,7 +130,7 @@ try // create a dummy session just to see whether the Engine is functional. // reason: here we still can log errors to stderr, because prepare_run() is called before daemonize(). - PEP_STATUS status = pEp::call_with_lock(&init, &first_session, pEp::CallbackDispatcher::messageToSend, pEp::Adapter::_inject_sync_event); + PEP_STATUS status = pEp::call_with_lock(&init, &first_session, pEp::CallbackDispatcher::messageToSend, pEp::Adapter::_inject_sync_event, pEp::Adapter::_ensure_passphrase); if(status != PEP_STATUS_OK || first_session==nullptr) { const std::string error_msg = "Cannot create first session! PEP_STATUS: " + ::pEp::status_to_string(status) + "."; diff --git a/server/session_registry.cc b/server/session_registry.cc index 5d181ce..5e84ced 100644 --- a/server/session_registry.cc +++ b/server/session_registry.cc @@ -2,6 +2,7 @@ #include #include #include +#include // creates a PEP_SESSION if none yet exists for the given thread @@ -17,7 +18,7 @@ PEP_SESSION SessionRegistry::get(std::thread::id tid) } PEP_SESSION session = nullptr; - PEP_STATUS status = pEp::call_with_lock(&init, &session, mts, ise); + PEP_STATUS status = pEp::call_with_lock(&init, &session, mts, ise, pEp::Adapter::_ensure_passphrase); if(status != PEP_STATUS_OK) { throw std::runtime_error("init() fails: " + pEp::status_to_string(status) );