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

Fixed a bug in unofficial release of beta1 reported by Martijn in devel - missing security context error when using separate SecurityDatabase

Browse Source
This commit is contained in:
alexpeshkoff 2014-10-28 13:41:40 +00:00
parent 81add8d7a2
commit e2c5296097
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/remote/remote.h
View File

@ -885,7 +885,6 @@ struct rem_port : public Firebird::GlobalStorage, public Firebird::RefCounted
rem_str* port_host; // Our name
rem_str* port_connection; // Name of connection
Firebird::string port_login;
Firebird::PathName port_security_db;
Firebird::string port_user_name;
Firebird::string port_peer_name;
Firebird::string port_protocol_id; // String containing protocol name for this port
@ -943,7 +942,7 @@ public:
port_packet_vector(0),
#endif
port_objects(getPool()), port_version(0), port_host(0),
port_connection(0), port_login(getPool()), port_security_db(getPool()),
port_connection(0), port_login(getPool()),
port_user_name(getPool()), port_peer_name(getPool()),
port_protocol_id(getPool()), port_address(getPool()),
port_rpr(0), port_statement(0), port_receive_rmtque(0),

5
src/remote/server/server.cpp
View File

@ -1720,10 +1720,7 @@ static bool accept_connection(rem_port* port, P_CNCT* connect, PACKET* send)
{
// Setup correct configuration for port
PathName dbName(connect->p_cnct_file.cstr_address, connect->p_cnct_file.cstr_length);
RefPtr<Config> dbConfig = REMOTE_get_config(&dbName);
port->port_security_db = dbConfig->getSecurityDatabase();
port->port_config = REMOTE_get_config(port->port_security_db.hasData() ?
&port->port_security_db : NULL);
port->port_config = REMOTE_get_config(&dbName);
// Clear accept data
send->p_acpd.p_acpt_plugin.cstr_length = 0;