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

Renamed security3.fdb -> security4.fdb.

Browse Source
This commit is contained in:
dimitr 2016-03-06 08:32:18 +00:00
parent 277d85c520
commit 7b69e1f195
14 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autogen.sh
View File

@ -3,7 +3,7 @@
# Run this to generate all the initial makefiles, etc. # Run this to generate all the initial makefiles, etc.
# #
PKG_NAME=Firebird3 PKG_NAME=Firebird4
SRCDIR=`dirname $0` SRCDIR=`dirname $0`
if [ -z "$AUTORECONF" ] if [ -z "$AUTORECONF" ]

2
builds/install/arch-specific/linux/makeInstallImage.sh.in
View File

@ -37,7 +37,7 @@ fi
BuildRootDir=.. BuildRootDir=..
BuiltFBDir=Release/firebird # Where the just build fb exists. BuiltFBDir=Release/firebird # Where the just build fb exists.
TargetDir=buildroot # Where we want to build the install image TargetDir=buildroot # Where we want to build the install image
SecurityDatabase=security3.fdb SecurityDatabase=security4.fdb
#------------------------------------------------------------------------ #------------------------------------------------------------------------

6
builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
View File

@ -792,7 +792,7 @@ else
SharedFileArray[27].Filename := ExpandConstant('{app}')+'databases.conf'; SharedFileArray[27].Filename := ExpandConstant('{app}')+'databases.conf';
SharedFileArray[28].Filename := ExpandConstant('{app}')+'firebird.conf'; SharedFileArray[28].Filename := ExpandConstant('{app}')+'firebird.conf';
SharedFileArray[29].Filename := ExpandConstant('{app}')+'firebird.log'; SharedFileArray[29].Filename := ExpandConstant('{app}')+'firebird.log';
SharedFileArray[30].Filename := ExpandConstant('{app}')+'security3.fdb'; SharedFileArray[30].Filename := ExpandConstant('{app}')+'security4.fdb';
SharedFileArray[31].Filename := ExpandConstant('{app}')+'fbtrace.conf'; SharedFileArray[31].Filename := ExpandConstant('{app}')+'fbtrace.conf';
SharedFileArray[32].Filename := ExpandConstant('{app}')+'fbsvcmgr.exe'; SharedFileArray[32].Filename := ExpandConstant('{app}')+'fbsvcmgr.exe';
SharedFileArray[33].Filename := ExpandConstant('{app}')+'fbrmclib.dll'; SharedFileArray[33].Filename := ExpandConstant('{app}')+'fbrmclib.dll';
@ -1177,7 +1177,7 @@ begin
LoadStringFromFile( GetAppPath+'\firebird.conf', FirebirdConfStr ); LoadStringFromFile( GetAppPath+'\firebird.conf', FirebirdConfStr );
if pos('SharedDatabase', FirebirdConfStr) > 0 then begin if pos('SharedDatabase', FirebirdConfStr) > 0 then begin
RenameFile(GetAppPath+'\firebird.conf', GetAppPath+'\firebird.conf.preRC1'); RenameFile(GetAppPath+'\firebird.conf', GetAppPath+'\firebird.conf.preRC1');
RenameFile(GetAppPath+'\security3.fdb', GetAppPath+'\security3.fdb.preRC1'); RenameFile(GetAppPath+'\security4.fdb', GetAppPath+'\security4.fdb.preRC1');
end end
end end
end; end;
@ -1185,7 +1185,7 @@ end;
function ConfigureAuthentication: boolean; function ConfigureAuthentication: boolean;
begin begin
if FileExists(WizardDirValue + '\security3.fdb') then if FileExists(WizardDirValue + '\security4.fdb') then
Result := false Result := false
else else
Result := true; Result := true;

10
builds/install/arch-specific/win32/FirebirdInstall_30.iss
View File

@ -474,8 +474,8 @@ Source: {#FilesDir}\firebird.conf; DestDir: {app}; DestName: firebird.conf; Comp
Source: {#FilesDir}\fbtrace.conf; DestDir: {app}; DestName: fbtrace.conf.default; Components: ServerComponent; Source: {#FilesDir}\fbtrace.conf; DestDir: {app}; DestName: fbtrace.conf.default; Components: ServerComponent;
Source: {#FilesDir}\fbtrace.conf; DestDir: {app}; DestName: fbtrace.conf; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist; check: NofbtraceConfExists; Source: {#FilesDir}\fbtrace.conf; DestDir: {app}; DestName: fbtrace.conf; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist; check: NofbtraceConfExists;
Source: {#FilesDir}\databases.conf; DestDir: {app}; Components: ClientComponent; Flags: uninsneveruninstall onlyifdoesntexist Source: {#FilesDir}\databases.conf; DestDir: {app}; Components: ClientComponent; Flags: uninsneveruninstall onlyifdoesntexist
Source: {#FilesDir}\security3.fdb; DestDir: {app}; Destname: security3.fdb.empty; Components: ServerComponent; Source: {#FilesDir}\security4.fdb; DestDir: {app}; Destname: security4.fdb.empty; Components: ServerComponent;
Source: {#FilesDir}\security3.fdb; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist Source: {#FilesDir}\security4.fdb; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist
Source: {#FilesDir}\firebird.msg; DestDir: {app}; Components: ClientComponent; Flags: sharedfile ignoreversion Source: {#FilesDir}\firebird.msg; DestDir: {app}; Components: ClientComponent; Flags: sharedfile ignoreversion
Source: {#FilesDir}\firebird.log; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall skipifsourcedoesntexist external dontcopy Source: {#FilesDir}\firebird.log; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall skipifsourcedoesntexist external dontcopy
@ -1074,7 +1074,7 @@ begin
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.log', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.log', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\databases.conf', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\databases.conf', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security3.fdb', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security4.fdb', false);
InitSecurityDB; InitSecurityDB;
@ -1189,8 +1189,8 @@ begin
aStringList.add(appPath+'\firebird.log'); aStringList.add(appPath+'\firebird.log');
aStringList.add(appPath+'\databases.conf'); aStringList.add(appPath+'\databases.conf');
aStringList.add(appPath+'\fbtrace.conf'); aStringList.add(appPath+'\fbtrace.conf');
aStringList.add(appPath+'\security3.fdb'); aStringList.add(appPath+'\security4.fdb');
aStringList.add(appPath+'\security3.fdb.old'); aStringList.add(appPath+'\security4.fdb.old');
for count := 0 to aStringList.count - 1 do begin for count := 0 to aStringList.count - 1 do begin
// We are manually handling the share count of these files, so we must // We are manually handling the share count of these files, so we must

2
builds/install/misc/databases.conf.in
View File

@ -24,7 +24,7 @@ employee = $(dir_sampleDb)/employee.fdb
# Master security database specific setup. # Master security database specific setup.
# Do not remove it until you understand well what are you doing! # Do not remove it until you understand well what are you doing!
# #
security.db = $(dir_secDb)/security3.fdb security.db = $(dir_secDb)/security4.fdb
{ {
RemoteAccess = false RemoteAccess = false
DefaultDbCachePages = 50 DefaultDbCachePages = 50

2
builds/install/misc/firebird.conf.in
View File

@ -772,7 +772,7 @@
# #
# Type: string (pathname) # Type: string (pathname)
# #
#SecurityDatabase = $(dir_secDb)/security3.fdb #SecurityDatabase = $(dir_secDb)/security4.fdb
# ============================== # ==============================

2
builds/install/posix-common/posixLibrary.sh.in
View File

@ -43,7 +43,7 @@ Answer=""
OrigPasswd="" OrigPasswd=""
TmpFile="" TmpFile=""
MANIFEST_TXT="" MANIFEST_TXT=""
SecurityDatabase=security3.fdb SecurityDatabase=security4.fdb
DefaultLibrary=libfbclient DefaultLibrary=libfbclient
UninstallScript=FirebirdUninstall.sh UninstallScript=FirebirdUninstall.sh
ArchiveDateTag=`date +"%Y%m%d_%H%M"` ArchiveDateTag=`date +"%Y%m%d_%H%M"`

2
builds/posix/Makefile.in
View File

@ -310,7 +310,7 @@ $(GPRE): $(GPRE_Objects) $(COMMON_LIB)
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
HELP_FDB = $(FIREBIRD)/help/help.fdb HELP_FDB = $(FIREBIRD)/help/help.fdb
SECURITY_FDB = $(FIREBIRD)/security3.fdb SECURITY_FDB = $(FIREBIRD)/security4.fdb
SECURITY_TMP = security.tmp SECURITY_TMP = security.tmp
databases: yachts.lnk msg.timestamp $(HELP_FDB) $(SECURITY_FDB) databases: yachts.lnk msg.timestamp $(HELP_FDB) $(SECURITY_FDB)

2
builds/posix/make.defaults
View File

@ -351,7 +351,7 @@ FBMGR_BIN = $(BIN)/fbmgr.bin$(EXEC_EXT)
INSTREG = $(BIN)/instreg$(EXEC_EXT) INSTREG = $(BIN)/instreg$(EXEC_EXT)
INSTSVC = $(BIN)/instsvc$(EXEC_EXT) INSTSVC = $(BIN)/instsvc$(EXEC_EXT)
SECURITY_FDB = $(FIREBIRD)/security3.fdb SECURITY_FDB = $(FIREBIRD)/security4.fdb
# From qli # From qli
QLI = $(BIN)/qli$(EXEC_EXT) QLI = $(BIN)/qli$(EXEC_EXT)

2
builds/win32/make_all.bat
View File

@ -73,7 +73,7 @@ findstr /V "@UDF_COMMENT@" %FB_ROOT_PATH%\builds\install\misc\firebird.conf.in >
@copy %FB_ROOT_PATH%\builds\install\misc\IDPLicense.txt %FB_OUTPUT_DIR% >nul @copy %FB_ROOT_PATH%\builds\install\misc\IDPLicense.txt %FB_OUTPUT_DIR% >nul
:: DATABASES :: DATABASES
@copy %FB_GEN_DIR%\dbs\security3.FDB %FB_OUTPUT_DIR%\security3.fdb >nul @copy %FB_GEN_DIR%\dbs\security4.FDB %FB_OUTPUT_DIR%\security4.fdb >nul
@copy %FB_GEN_DIR%\dbs\HELP.fdb %FB_OUTPUT_DIR%\help\help.fdb >nul @copy %FB_GEN_DIR%\dbs\HELP.fdb %FB_OUTPUT_DIR%\help\help.fdb >nul
:: DOCS :: DOCS

6
builds/win32/make_boot.bat
View File

@ -236,9 +236,9 @@ goto :EOF
@rmdir /s /q %FB_GEN_DIR%\dbs 2>nul @rmdir /s /q %FB_GEN_DIR%\dbs 2>nul
@mkdir %FB_GEN_DIR%\dbs 2>nul @mkdir %FB_GEN_DIR%\dbs 2>nul
@echo create database '%FB_GEN_DB_DIR%\dbs\security3.fdb'; | "%FB_BIN_DIR%\isql" -q @echo create database '%FB_GEN_DB_DIR%\dbs\security4.fdb'; | "%FB_BIN_DIR%\isql" -q
@"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/security3.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql @"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/security4.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql
@copy %FB_GEN_DIR%\dbs\security3.fdb %FB_GEN_DIR%\dbs\security.fdb > nul @copy %FB_GEN_DIR%\dbs\security4.fdb %FB_GEN_DIR%\dbs\security.fdb > nul
@%FB_BIN_DIR%\gbak -r %FB_ROOT_PATH%\builds\misc\metadata.gbak %FB_GEN_DB_DIR%/dbs/metadata.fdb @%FB_BIN_DIR%\gbak -r %FB_ROOT_PATH%\builds\misc\metadata.gbak %FB_GEN_DB_DIR%/dbs/metadata.fdb

2
configure.ac
View File

@ -1339,7 +1339,7 @@ AC_OUTPUT
dnl Print out the build configuration (the most interesting thing) dnl Print out the build configuration (the most interesting thing)
echo echo
echo echo
echo The Firebird3 package has been configured with the following options: echo The Firebird4 package has been configured with the following options:
echo echo
case $DEVEL_FLG in case $DEVEL_FLG in

2
src/CMakeLists.txt
View File

@ -936,7 +936,7 @@ add_subdirectory("utilities")
add_custom_target(copy_files add_custom_target(copy_files
#ALL # uncomment this to copy files every build #ALL # uncomment this to copy files every build
# databases # databases
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/security.fdb ${output_dir}/security3.fdb COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/security.fdb ${output_dir}/security4.fdb
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/help.fdb ${output_dir}/help/help.fdb COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/help.fdb ${output_dir}/help/help.fdb
# configs, text files # configs, text files
COMMAND sed "/@UDF_COMMENT@/d" < ${CMAKE_SOURCE_DIR}/builds/install/misc/firebird.conf.in > ${output_dir}/firebird.conf COMMAND sed "/@UDF_COMMENT@/d" < ${CMAKE_SOURCE_DIR}/builds/install/misc/firebird.conf.in > ${output_dir}/firebird.conf

2
src/common/config/config.cpp
View File

@ -185,7 +185,7 @@ const Config::ConfigEntry Config::entries[MAX_CONFIG_KEY] =
#endif #endif
{TYPE_STRING, "UserManager", (ConfigValue) "Srp"}, {TYPE_STRING, "UserManager", (ConfigValue) "Srp"},
{TYPE_STRING, "TracePlugin", (ConfigValue) "fbtrace"}, {TYPE_STRING, "TracePlugin", (ConfigValue) "fbtrace"},
{TYPE_STRING, "SecurityDatabase", (ConfigValue) "$(dir_secDb)/security3.fdb"}, // security database name {TYPE_STRING, "SecurityDatabase", (ConfigValue) "$(dir_secDb)/security4.fdb"}, // security database name
{TYPE_STRING, "ServerMode", (ConfigValue) "Super"}, {TYPE_STRING, "ServerMode", (ConfigValue) "Super"},
{TYPE_STRING, "WireCrypt", (ConfigValue) NULL}, {TYPE_STRING, "WireCrypt", (ConfigValue) NULL},
{TYPE_STRING, "WireCryptPlugin", (ConfigValue) "Arc4"}, {TYPE_STRING, "WireCryptPlugin", (ConfigValue) "Arc4"},