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

Fixed a connection error (FB3 client - FB3 server), only LegacyAuth was affected.

Browse Source
This commit is contained in:
dimitr 2011-12-26 12:57:30 +00:00
parent 60568258c3
commit 1129013cf8
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1355,7 +1355,6 @@ static bool accept_connection(rem_port* port, P_CNCT* connect, PACKET* send)
// We are going to try authentication handshake
LocalStatus status;
P_ACPT* accept = &send->p_acpt;
bool returnData = false;
if (accepted && version >= PROTOCOL_VERSION13)
{
@ -1377,7 +1376,6 @@ static bool accept_connection(rem_port* port, P_CNCT* connect, PACKET* send)
if (port->port_srv_auth_block->getPluginName())
{
accept = &send->p_acpd;
Firebird::PathName file(connect->p_cnct_file.cstr_address, connect->p_cnct_file.cstr_length);
port->port_srv_auth_block->setPath(&file);
HANDSHAKE_DEBUG(fprintf(stderr, "accept connection calls createPluginsItr\n"));
@ -1441,10 +1439,11 @@ static bool accept_connection(rem_port* port, P_CNCT* connect, PACKET* send)
return false;
}
send->p_operation = returnData ? op_accept_data : op_accept;
P_ACPT* accept = returnData ? &send->p_acpd : &send->p_acpt;
accept->p_acpt_version = port->port_protocol = version;
accept->p_acpt_architecture = architecture;
accept->p_acpt_type = type;
send->p_operation = returnData ? op_accept_data : op_accept;
HANDSHAKE_DEBUG(fprintf(stderr, "accepted ud=%d v=%x\n", returnData, version));