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

verify DatabaseAccess in the same style&place for both attach and create

Browse Source
This commit is contained in:
alexpeshkoff 2004-12-20 17:44:25 +00:00
parent 93f082780b
commit 643c54fba5
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/jrd/jrd.cpp
View File

@ -773,7 +773,6 @@ ISC_STATUS GDS_ATTACH_DATABASE(ISC_STATUS* user_status,
LCK_init(tdbb, LCK_OWNER_database);
dbb->dbb_flags |= DBB_lck_init_done;
INI_init();
// FUN_init();
dbb->dbb_file =
PIO_open(dbb, expanded_name.c_str(), expanded_name.length(),
options.dpb_trace != 0, NULL, file_name, file_length);
@ -1739,6 +1738,16 @@ ISC_STATUS GDS_CREATE_DATABASE(ISC_STATUS* user_status,
thread_db thd_context;
thread_db* tdbb = JRD_MAIN_set_thread_data(thd_context);
/* Check database against conf file. */
const vdnResult vdn = verify_database_name(expanded_name, user_status);
if (!is_alias && vdn == vdnFail)
{
JRD_restore_context();
return user_status[1];
}
else
user_status[0] = 0; // Clear status vector
Database* dbb = init(tdbb, user_status, expanded_name, false);
if (!dbb) {
#if defined(V4_THREADING) && !defined(SUPERSERVER)
@ -1800,16 +1809,6 @@ ISC_STATUS GDS_CREATE_DATABASE(ISC_STATUS* user_status,
}
}
// Check for DatabaseAccess
const vdnResult vdn = verify_database_name(expanded_name, user_status);
if (!is_alias && vdn == vdnFail)
{
ERR_punt();
}
else
user_status[0] = 0; // Clear status vector.
if (options.dpb_key.hasData())
{
dbb->dbb_encrypt_key = options.dpb_key;
@ -1882,7 +1881,6 @@ ISC_STATUS GDS_CREATE_DATABASE(ISC_STATUS* user_status,
LCK_init(tdbb, LCK_OWNER_database);
dbb->dbb_flags |= DBB_lck_init_done;
INI_init();
// FUN_init();
PAG_init();
#if defined(V4_THREADING) && !defined(SUPERSERVER)
V4_JRD_MUTEX_UNLOCK(dbb->dbb_mutexes + DBB_MUTX_init_fini);