firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 18:43:02 +01:00
Code Issues

Postfix for #7951: Make it possible to handle attach errors in key holder plugin, fixed lost warnings

Browse Source
This commit is contained in:
AlexPeshkoff 2024-01-24 13:12:34 +03:00
parent fd135f41e8
commit 1b431bc8db
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/remote/client/interface.cpp
View File

@ -8412,27 +8412,27 @@ static bool init(CheckStatusWrapper* status, ClntAuthBlock& cBlock, rem_port* po
}
catch (const Exception& ex)
{
FbLocalStatus stAttach;
FbLocalStatus stAttach, statusAfterAttach;
ex.stuffException(&stAttach);
const ISC_STATUS* v = stAttach->getErrors();
if (cb && (fb_utils::containsErrorCode(v, isc_bad_crypt_key) ||
fb_utils::containsErrorCode(v, isc_db_crypt_key)) &&
(cb->afterAttach(status, file_name.c_str(), &stAttach) == ICryptKeyCallback::DO_RETRY))
fb_utils::containsErrorCode(v, isc_db_crypt_key)))
{
continue;
auto rc = cb->afterAttach(&statusAfterAttach, file_name.c_str(), &stAttach);
if (statusAfterAttach.isSuccess() && rc == ICryptKeyCallback::DO_RETRY)
continue;
}
status->init();
throw;
}
// response is success
if (cb)
{
cb->afterAttach(status, file_name.c_str(), nullptr);
status->init();
FbLocalStatus statusAfterAttach;
cb->afterAttach(&statusAfterAttach, file_name.c_str(), nullptr);
check(&statusAfterAttach);
}
return true;