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

Fixed code disabling access to network filenames in embedded mode

Browse Source
This commit is contained in:
alexpeshkoff 2015-05-20 13:07:06 +00:00
parent 90cb9dd29a
commit 364995fb88
1 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/jrd/jrd.cpp
View File

@ -1007,8 +1007,6 @@ static void run_commit_triggers(thread_db* tdbb, jrd_tra* transaction);
static jrd_req* verify_request_synchronization(JrdStatement* statement, USHORT level);
static void purge_transactions(thread_db*, Jrd::Attachment*, const bool);
static void handle_error(Firebird::CheckStatusWrapper*, ISC_STATUS);
namespace {
enum VdnResult {VDN_FAIL, VDN_OK/*, VDN_SECURITY*/};
}
@ -1432,9 +1430,7 @@ JAttachment* JProvider::internalAttach(CheckStatusWrapper* user_status, const ch
// Check to see if the database is truly local
if (ISC_check_if_remote(expanded_name, true))
{
handle_error(user_status, isc_unavailable);
}
ERR_post(Arg::Gds(isc_unavailable));
// Check for correct credentials supplied
getUserInfo(userId, options, org_filename.c_str(), expanded_name.c_str(),
@ -2461,9 +2457,7 @@ JAttachment* JProvider::createDatabase(CheckStatusWrapper* user_status, const ch
// Check to see if the database is truly local or if it just looks
// that way
if (ISC_check_if_remote(expanded_name, true))
{
handle_error(user_status, isc_unavailable);
}
ERR_post(Arg::Gds(isc_unavailable));
// Check for correct credentials supplied
getUserInfo(userId, options, org_filename.c_str(), NULL, &config, true, cryptCallback);
@ -6000,27 +5994,6 @@ void DatabaseOptions::get(const UCHAR* dpb, USHORT dpb_length, bool& invalid_cli
}
static void handle_error(CheckStatusWrapper* user_status, ISC_STATUS code)
{
/**************************************
*
* h a n d l e _ e r r o r
*
**************************************
*
* Functional description
* An invalid handle has been passed in. If there is a user status
* vector, make it reflect the error. If not, emulate the routine
* "error" and abort.
*
**************************************/
if (user_status)
{
Arg::Gds(code).copyTo(user_status);
}
}
static JAttachment* initAttachment(thread_db* tdbb, const PathName& expanded_name,
const PathName& alias_name, RefPtr<Config> config, bool attach_flag,
const DatabaseOptions& options, RefMutexUnlock& initGuard, IPluginConfig* pConf)