SrpManagement.cpp (Firebird-3.0.2.32703-0.tar.bz2) | : | SrpManagement.cpp (Firebird-3.0.4.33054-0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 224 | skipping to change at line 224 | |||
} | } | |||
const char* secDbName = config->asString(secDbKey); | const char* secDbName = config->asString(secDbKey); | |||
if (!(secDbName && secDbName[0])) | if (!(secDbName && secDbName[0])) | |||
{ | { | |||
Firebird::Arg::Gds(isc_secdb_name).raise(); | Firebird::Arg::Gds(isc_secdb_name).raise(); | |||
} | } | |||
Firebird::ClumpletWriter dpb(Firebird::ClumpletReader::dp bList, MAX_DPB_SIZE); | Firebird::ClumpletWriter dpb(Firebird::ClumpletReader::dp bList, MAX_DPB_SIZE); | |||
dpb.insertByte(isc_dpb_sec_attach, TRUE); | dpb.insertByte(isc_dpb_sec_attach, TRUE); | |||
dpb.insertString(isc_dpb_config, EMBEDDED_PROVIDERS, fb_s trlen(EMBEDDED_PROVIDERS)); | ||||
unsigned int authBlockSize; | unsigned int authBlockSize; | |||
const unsigned char* authBlock = logonInfo->authBlock(&au thBlockSize); | const unsigned char* authBlock = logonInfo->authBlock(&au thBlockSize); | |||
const char* str = logonInfo->role(); | const char* str = logonInfo->role(); | |||
if (str && str[0]) | if (str && str[0]) | |||
dpb.insertString(isc_dpb_sql_role_name, str, fb_s trlen(str)); | dpb.insertString(isc_dpb_sql_role_name, str, fb_s trlen(str)); | |||
if (authBlockSize) | if (authBlockSize) | |||
{ | { | |||
skipping to change at line 678 | skipping to change at line 679 | |||
return 0; | return 0; | |||
} | } | |||
return 1; | return 1; | |||
} | } | |||
private: | private: | |||
Firebird::RefPtr<Firebird::IFirebirdConf> config; | Firebird::RefPtr<Firebird::IFirebirdConf> config; | |||
Firebird::RefPtr<Firebird::IAttachment> att; | Firebird::RefPtr<Firebird::IAttachment> att; | |||
Firebird::RefPtr<Firebird::ITransaction> tra; | Firebird::RefPtr<Firebird::ITransaction> tra; | |||
RemotePassword server; | RemotePasswordImpl<Firebird::Sha1> server; | |||
int upCount, delCount; | int upCount, delCount; | |||
bool checkCount(Firebird::CheckStatusWrapper* status, int* count, UCHAR i tem) | bool checkCount(Firebird::CheckStatusWrapper* status, int* count, UCHAR i tem) | |||
{ | { | |||
unsigned char buffer[100]; | unsigned char buffer[100]; | |||
att->getInfo(status, 1, &item, sizeof(buffer), buffer); | att->getInfo(status, 1, &item, sizeof(buffer), buffer); | |||
check(status); | check(status); | |||
if (gds__vax_integer(buffer + 1, 2) != 6) | if (gds__vax_integer(buffer + 1, 2) != 6) | |||
{ | { | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 2 lines changed or added |