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

Postfix for CORE-6412, fixed non-ascii users support

Browse Source
This commit is contained in:
AlexPeshkoff 2020-11-06 16:31:23 +03:00
parent 57d43bb443
commit 98e8418aa0
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/jrd/UserManagement.cpp
View File

@ -140,6 +140,14 @@ namespace
string value;
bool present;
};
class ChangeCharset : public AutoSetRestore<SSHORT>
{
public:
ChangeCharset(Attachment* att)
: AutoSetRestore(&att->att_charset, CS_NONE)
{ }
};
} // anonymous namespace
const Format* UsersTableScan::getFormat(thread_db* tdbb, jrd_rel* relation) const
@ -185,6 +193,7 @@ IManagement* UserManagement::registerManager(Auth::Get& getPlugin, const char* p
CheckStatusWrapper statusWrapper(&status);
UserIdInfo idInfo(att, tra);
ChangeCharset cc(att);
manager->start(&statusWrapper, &idInfo);
if (status.getState() & IStatus::STATE_ERRORS)
{
@ -271,6 +280,7 @@ UserManagement::~UserManagement()
LocalStatus status;
CheckStatusWrapper statusWrapper(&status);
ChangeCharset cc(att);
manager->rollback(&statusWrapper);
PluginManagerInterfacePtr()->releasePlugin(manager);
managers[i].second = NULL;
@ -293,6 +303,7 @@ void UserManagement::commit()
LocalStatus status;
CheckStatusWrapper statusWrapper(&status);
ChangeCharset cc(att);
manager->commit(&statusWrapper);
if (status.getState() & IStatus::STATE_ERRORS)
status_exception::raise(&statusWrapper);
@ -363,6 +374,7 @@ void UserManagement::execute(USHORT id)
LocalStatus status;
CheckStatusWrapper statusWrapper(&status);
ChangeCharset cc(att);
if (command->attr.entered() || command->op == Auth::ADDMOD_OPER)
{