[Firebird-checkins] SF.net SVN: firebird:[60140] firebird/trunk/src/remote

[<ale...@us...>]

Revision: 60140
          http://sourceforge.net/p/firebird/code/60140
Author:   alexpeshkoff
Date:     2014-10-28 13:41:40 +0000 (Tue, 28 Oct 2014)
Log Message:
-----------
Fixed a bug in unofficial release of beta1 reported by Martijn in devel - missing security context error when using separate SecurityDatabase

Modified Paths:
--------------
    firebird/trunk/src/remote/remote.h
    firebird/trunk/src/remote/server/server.cpp

Modified: firebird/trunk/src/remote/remote.h
===================================================================
--- firebird/trunk/src/remote/remote.h	2014-10-27 19:20:30 UTC (rev 60139)
+++ firebird/trunk/src/remote/remote.h	2014-10-28 13:41:40 UTC (rev 60140)
@@ -885,7 +885,6 @@
 	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 @@
 		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),

Modified: firebird/trunk/src/remote/server/server.cpp
===================================================================
--- firebird/trunk/src/remote/server/server.cpp	2014-10-27 19:20:30 UTC (rev 60139)
+++ firebird/trunk/src/remote/server/server.cpp	2014-10-28 13:41:40 UTC (rev 60140)
@@ -1720,10 +1720,7 @@
 	{
 		// 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;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.