UserManager = Srp
TracePlugin = fbtrace
Providers = -Remote,Engine12,Loopback
+Remote,Engine13,LoopbackWireCryptPlugin = Arc4
This provides normal operation in server, client and embedded cases. If you want to add @@ -158,10 +158,10 @@ default equals to plugin implementation's name (and it's factory name which is actually used in firebird.conf). Certainly in typical case, module contains one plugin, and that plugin works with only one configuration, and all 3 names are equal, and no more configuration -is needed – for example libEngine12.so or Engine12.dll contains -implementation of provider Engine12, and nothing else except record +is needed – for example libEngine13.so or Engine13.dll contains +implementation of provider Engine13, and nothing else except record
-Providers = Engine12
+Providers = Engine13
in firebird.conf is needed to load it. But if you have something complex – configuration file plugins.conf will help you to have such plugin factories which you diff --git a/doc/README.providers.html b/doc/README.providers.html index 97aa5e5461..f513c7797a 100644 --- a/doc/README.providers.html +++ b/doc/README.providers.html @@ -47,7 +47,7 @@ attach stage.
Next samples are with default configuration, which contains 3 providers: -Remote (establish network connection), Engine12 (main +Remote (establish network connection), Engine13 (main database engine) and Loopback (force network connection to local server for database name without explicitly given network protocol).
@@ -59,7 +59,7 @@ provider in the list) at once redirects such call to RemoteHost. That's how typical client configuration works.When database name does not contain network protocol (just dbname) -Remote provider rejects it and Engine12 provider comes +Remote provider rejects it and Engine13 provider comes to stage. It tries to open dbname – and in case of success we get embedded connection to the database. Pay attention – we do not need special embedded library to have embedded connection, @@ -74,7 +74,7 @@ to open database file. This is normal case if database was not created by that user in embedded mode or if he was not explicitly given OS rights for embedded access to databases on given box. Moreover, setting access rights in such a manner is a requirement for -correct superserver operation. So after failure of Engine12 to +correct superserver operation. So after failure of Engine13 to access database Loopback provider is attempted for an attach. It does not differ much from Remote, but tries to access database dbname on a server running on local host. On windows diff --git a/doc/Using_OO_API.html b/doc/Using_OO_API.html index ffad9ce20e..347fb128b0 100644 --- a/doc/Using_OO_API.html +++ b/doc/Using_OO_API.html @@ -1428,7 +1428,7 @@ file is stored (firebird.log)
DIR_GUARD – where guardian lock is stored (fb_guard)
DIR_PLUGINS – -plugins directory ([lib]Engine12.{dll|so})
+plugins directory ([lib]Engine13.{dll|so})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ab80ca85fa..af5e2ca785 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -502,7 +502,7 @@ add_library (boot_engine SHARED ${engine_generated_src_boot} ${V
target_link_libraries (boot_engine engine_common boot_alice boot_burp common boot_yvalve)
set_output_directory (boot_engine plugins CURRENT_DIR)
set_exported_symbols (boot_engine fbplugin)
-copy_and_rename_lib (boot_engine Engine12)
+copy_and_rename_lib (boot_engine Engine13)
project_group (boot_engine Boot)
endif() # if (NOT CMAKE_CROSSCOMPILING)
@@ -514,7 +514,7 @@ endif() # if (NOT CMAKE_CROSSCOMPILING)
add_library (engine SHARED ${engine_generated_src_master} ${VERSION_RC})
target_link_libraries (engine engine_common alice burp common yvalve)
-set_target_properties (engine PROPERTIES OUTPUT_NAME Engine12)
+set_target_properties (engine PROPERTIES OUTPUT_NAME Engine13)
set_output_directory (engine plugins)
set_exported_symbols (engine fbplugin)