Browse Source

make session explicit

ENGINE-781
Volker Birk 5 years ago
parent
commit
2bec9fb516
  1. 4
      passphrase_cache.cc
  2. 2
      passphrase_cache.hh

4
passphrase_cache.cc

@ -125,7 +125,7 @@ namespace pEp {
return c._which->passphrase.c_str(); return c._which->passphrase.c_str();
} }
PEP_STATUS PassphraseCache::config_next_passphrase(bool reset) PEP_STATUS PassphraseCache::config_next_passphrase(bool reset, PEP_SESSION session)
{ {
static pEp::PassphraseCache _copy; static pEp::PassphraseCache _copy;
static bool new_copy = true; static bool new_copy = true;
@ -141,7 +141,7 @@ namespace pEp {
} }
try { try {
::config_passphrase(Adapter::session(), latest_passphrase(_copy)); ::config_passphrase(session ? session : Adapter::session(), latest_passphrase(_copy));
return PEP_STATUS_OK; return PEP_STATUS_OK;
} }
catch (pEp::PassphraseCache::Empty&) { catch (pEp::PassphraseCache::Empty&) {

2
passphrase_cache.hh

@ -58,7 +58,7 @@ namespace pEp {
// other until the cache is exhausted // other until the cache is exhausted
// call with reset = true to reset the iterator // call with reset = true to reset the iterator
static PEP_STATUS config_next_passphrase(bool reset=false); static PEP_STATUS config_next_passphrase(bool reset=false, PEP_SESSION session = NULL);
// convenience functions // convenience functions
// i.e. // i.e.

Loading…
Cancel
Save