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

Fixed CORE-5032: Cannot connect to a database which have own security database without security3.fdb

Browse Source
This commit is contained in:
alexpeshkoff 2015-12-16 17:12:53 +00:00
parent e39801c450
commit 3c3dbf657b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/remote/server/os/posix/inet_server.cpp
View File

@ -126,6 +126,11 @@ static void raiseLimit(int resource);
static void logSecurityDatabaseError(const char* path, ISC_STATUS* status)
{
// If I/O error happened then rather likely we just miss standard security DB
// Since FB3 with it's multiple security databases - not too big trouble
if (fb_utils::containsErrorCode(status, isc_unavailable))
return;
const int SHUTDOWN_TIMEOUT = 5000; // 5 sec
gds__log_status(path, status);
@ -403,11 +408,12 @@ int CLIB_ROUTINE main( int argc, char** argv)
{
logSecurityDatabaseError(path, status);
}
isc_detach_database(status, &db_handle);
if (status[0] == 1 && status[1] > 0)
{
logSecurityDatabaseError(path, status);
else {
isc_detach_database(status, &db_handle);
if (status[0] == 1 && status[1] > 0)
{
logSecurityDatabaseError(path, status);
}
}
} // end scope