remote.cpp (Firebird-3.0.2.32703-0.tar.bz2) | : | remote.cpp (Firebird-3.0.4.33054-0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 977 | skipping to change at line 977 | |||
{ | { | |||
srvList.getPath(serverPluginList); | srvList.getPath(serverPluginList); | |||
} | } | |||
} | } | |||
dataForPlugin.clear(); | dataForPlugin.clear(); | |||
dataFromPlugin.clear(); | dataFromPlugin.clear(); | |||
firstTime = true; | firstTime = true; | |||
clntConfig = REMOTE_get_config(fileName, &dpbConfig); | clntConfig = REMOTE_get_config(fileName, &dpbConfig); | |||
pluginList = clntConfig->getPlugins(Firebird::IPluginManager::TYPE_AUTH_C | pluginList = dpbPlugins.hasData() ? dpbPlugins : | |||
LIENT); | clntConfig->getPlugins(Firebird::IPluginManager::TYPE_AUTH_CLIENT | |||
); | ||||
Firebird::PathName final; | Firebird::PathName final; | |||
if (serverPluginList.hasData()) | if (serverPluginList.hasData()) | |||
{ | { | |||
Auth::mergeLists(final, serverPluginList, pluginList); | Auth::mergeLists(final, serverPluginList, pluginList); | |||
if (final.length() == 0) | if (final.length() == 0) | |||
{ | { | |||
HANDSHAKE_DEBUG(fprintf(stderr, "Cli: No matching plugins on client\n")); | HANDSHAKE_DEBUG(fprintf(stderr, "Cli: No matching plugins on client\n")); | |||
(Firebird::Arg::Gds(isc_login) | (Firebird::Arg::Gds(isc_login) | |||
#ifdef DEV_BUILD | #ifdef DEV_BUILD | |||
skipping to change at line 1323 | skipping to change at line 1324 | |||
class ZLib | class ZLib | |||
{ | { | |||
public: | public: | |||
explicit ZLib(Firebird::MemoryPool&) | explicit ZLib(Firebird::MemoryPool&) | |||
{ | { | |||
#ifdef WIN_NT | #ifdef WIN_NT | |||
const char* name = "zlib1.dll"; | const char* name = "zlib1.dll"; | |||
#else | #else | |||
const char* name = "libz." SHRLIB_EXT ".1"; | const char* name = "libz." SHRLIB_EXT ".1"; | |||
#endif | #endif | |||
z.reset(ModuleLoader::fixAndLoadModule(name)); | z.reset(ModuleLoader::fixAndLoadModule(NULL, name)); | |||
if (z) | if (z) | |||
symbols(); | symbols(); | |||
} | } | |||
int ZEXPORT (*deflateInit_)(z_stream* strm, int level, const char *version, int stream_size); | int ZEXPORT (*deflateInit_)(z_stream* strm, int level, const char *version, int stream_size); | |||
int ZEXPORT (*inflateInit_)(z_stream* strm, const char *version, int stream_size); | int ZEXPORT (*inflateInit_)(z_stream* strm, const char *version, int stream_size); | |||
int ZEXPORT (*deflate)(z_stream* strm, int flush); | int ZEXPORT (*deflate)(z_stream* strm, int flush); | |||
int ZEXPORT (*inflate)(z_stream* strm, int flush); | int ZEXPORT (*inflate)(z_stream* strm, int flush); | |||
void ZEXPORT (*deflateEnd)(z_stream* strm); | void ZEXPORT (*deflateEnd)(z_stream* strm); | |||
void ZEXPORT (*inflateEnd)(z_stream* strm); | void ZEXPORT (*inflateEnd)(z_stream* strm); | |||
skipping to change at line 1370 | skipping to change at line 1371 | |||
void freeFunc(void*, void* address) | void freeFunc(void*, void* address) | |||
{ | { | |||
MemoryPool::globalFree(address); | MemoryPool::globalFree(address); | |||
} | } | |||
} | } | |||
#endif // WIRE_COMPRESS_SUPPORT | #endif // WIRE_COMPRESS_SUPPORT | |||
rem_port::~rem_port() | rem_port::~rem_port() | |||
{ | { | |||
if (port_events_shutdown) | ||||
{ | ||||
port_events_shutdown(this); | ||||
} | ||||
delete port_srv_auth; | delete port_srv_auth; | |||
delete port_srv_auth_block; | delete port_srv_auth_block; | |||
delete port_version; | delete port_version; | |||
delete port_connection; | delete port_connection; | |||
delete port_host; | delete port_host; | |||
delete port_server_crypt_callback; | delete port_server_crypt_callback; | |||
#ifdef DEBUG_XDR_MEMORY | #ifdef DEBUG_XDR_MEMORY | |||
delete port_packet_vector; | delete port_packet_vector; | |||
#endif | #endif | |||
End of changes. 3 change blocks. | ||||
8 lines changed or deleted | 4 lines changed or added |