diff --git a/autogen.sh b/autogen.sh index 693f2c8dd1..577d1c0576 100755 --- a/autogen.sh +++ b/autogen.sh @@ -3,7 +3,7 @@ # Run this to generate all the initial makefiles, etc. # -PKG_NAME=Firebird3 +PKG_NAME=Firebird4 SRCDIR=`dirname $0` if [ -z "$AUTORECONF" ] diff --git a/builds/install/arch-specific/linux/makeInstallImage.sh.in b/builds/install/arch-specific/linux/makeInstallImage.sh.in index dad2b4291e..ca42a6d949 100644 --- a/builds/install/arch-specific/linux/makeInstallImage.sh.in +++ b/builds/install/arch-specific/linux/makeInstallImage.sh.in @@ -37,7 +37,7 @@ fi BuildRootDir=.. BuiltFBDir=Release/firebird # Where the just build fb exists. TargetDir=buildroot # Where we want to build the install image -SecurityDatabase=security3.fdb +SecurityDatabase=security4.fdb #------------------------------------------------------------------------ diff --git a/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc b/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc index 5998c65198..418d91b7b2 100644 --- a/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc +++ b/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc @@ -792,7 +792,7 @@ else SharedFileArray[27].Filename := ExpandConstant('{app}')+'databases.conf'; SharedFileArray[28].Filename := ExpandConstant('{app}')+'firebird.conf'; 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[32].Filename := ExpandConstant('{app}')+'fbsvcmgr.exe'; SharedFileArray[33].Filename := ExpandConstant('{app}')+'fbrmclib.dll'; @@ -1177,7 +1177,7 @@ begin LoadStringFromFile( GetAppPath+'\firebird.conf', FirebirdConfStr ); if pos('SharedDatabase', FirebirdConfStr) > 0 then begin 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; @@ -1185,7 +1185,7 @@ end; function ConfigureAuthentication: boolean; begin - if FileExists(WizardDirValue + '\security3.fdb') then + if FileExists(WizardDirValue + '\security4.fdb') then Result := false else Result := true; diff --git a/builds/install/arch-specific/win32/FirebirdInstall_30.iss b/builds/install/arch-specific/win32/FirebirdInstall_30.iss index 0f05454d87..6661bfa80b 100644 --- a/builds/install/arch-specific/win32/FirebirdInstall_30.iss +++ b/builds/install/arch-specific/win32/FirebirdInstall_30.iss @@ -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; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist; check: NofbtraceConfExists; 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}\security3.fdb; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist +Source: {#FilesDir}\security4.fdb; DestDir: {app}; Destname: security4.fdb.empty; Components: ServerComponent; +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.log; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall skipifsourcedoesntexist external dontcopy @@ -1074,7 +1074,7 @@ begin IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.log', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\databases.conf', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf', false); - IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security3.fdb', false); + IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security4.fdb', false); InitSecurityDB; @@ -1189,8 +1189,8 @@ begin aStringList.add(appPath+'\firebird.log'); aStringList.add(appPath+'\databases.conf'); aStringList.add(appPath+'\fbtrace.conf'); - aStringList.add(appPath+'\security3.fdb'); - aStringList.add(appPath+'\security3.fdb.old'); + aStringList.add(appPath+'\security4.fdb'); + aStringList.add(appPath+'\security4.fdb.old'); for count := 0 to aStringList.count - 1 do begin // We are manually handling the share count of these files, so we must diff --git a/builds/install/misc/databases.conf.in b/builds/install/misc/databases.conf.in index 8292777bbd..f5d616cc06 100644 --- a/builds/install/misc/databases.conf.in +++ b/builds/install/misc/databases.conf.in @@ -24,7 +24,7 @@ employee = $(dir_sampleDb)/employee.fdb # Master security database specific setup. # 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 DefaultDbCachePages = 50 diff --git a/builds/install/misc/firebird.conf.in b/builds/install/misc/firebird.conf.in index 9fbec68c69..da6751eeab 100644 --- a/builds/install/misc/firebird.conf.in +++ b/builds/install/misc/firebird.conf.in @@ -772,7 +772,7 @@ # # Type: string (pathname) # -#SecurityDatabase = $(dir_secDb)/security3.fdb +#SecurityDatabase = $(dir_secDb)/security4.fdb # ============================== diff --git a/builds/install/posix-common/posixLibrary.sh.in b/builds/install/posix-common/posixLibrary.sh.in index 810a5510a6..afb6781e74 100644 --- a/builds/install/posix-common/posixLibrary.sh.in +++ b/builds/install/posix-common/posixLibrary.sh.in @@ -43,7 +43,7 @@ Answer="" OrigPasswd="" TmpFile="" MANIFEST_TXT="" -SecurityDatabase=security3.fdb +SecurityDatabase=security4.fdb DefaultLibrary=libfbclient UninstallScript=FirebirdUninstall.sh ArchiveDateTag=`date +"%Y%m%d_%H%M"` diff --git a/builds/posix/Makefile.in b/builds/posix/Makefile.in index 2a236dc5a1..09f78d78f8 100644 --- a/builds/posix/Makefile.in +++ b/builds/posix/Makefile.in @@ -310,7 +310,7 @@ $(GPRE): $(GPRE_Objects) $(COMMON_LIB) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) HELP_FDB = $(FIREBIRD)/help/help.fdb -SECURITY_FDB = $(FIREBIRD)/security3.fdb +SECURITY_FDB = $(FIREBIRD)/security4.fdb SECURITY_TMP = security.tmp databases: yachts.lnk msg.timestamp $(HELP_FDB) $(SECURITY_FDB) diff --git a/builds/posix/make.defaults b/builds/posix/make.defaults index f68c44cc87..fb96fad291 100755 --- a/builds/posix/make.defaults +++ b/builds/posix/make.defaults @@ -351,7 +351,7 @@ FBMGR_BIN = $(BIN)/fbmgr.bin$(EXEC_EXT) INSTREG = $(BIN)/instreg$(EXEC_EXT) INSTSVC = $(BIN)/instsvc$(EXEC_EXT) -SECURITY_FDB = $(FIREBIRD)/security3.fdb +SECURITY_FDB = $(FIREBIRD)/security4.fdb # From qli QLI = $(BIN)/qli$(EXEC_EXT) diff --git a/builds/win32/make_all.bat b/builds/win32/make_all.bat index f9687daac2..2923623408 100644 --- a/builds/win32/make_all.bat +++ b/builds/win32/make_all.bat @@ -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 :: 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 :: DOCS diff --git a/builds/win32/make_boot.bat b/builds/win32/make_boot.bat index 4207f801f3..c6cce06e24 100644 --- a/builds/win32/make_boot.bat +++ b/builds/win32/make_boot.bat @@ -236,9 +236,9 @@ goto :EOF @rmdir /s /q %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 -@"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/security3.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql -@copy %FB_GEN_DIR%\dbs\security3.fdb %FB_GEN_DIR%\dbs\security.fdb > nul +@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/security4.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql +@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 diff --git a/configure.ac b/configure.ac index 3e65f10d2a..9c2c22269b 100644 --- a/configure.ac +++ b/configure.ac @@ -1339,7 +1339,7 @@ AC_OUTPUT dnl Print out the build configuration (the most interesting thing) 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 case $DEVEL_FLG in diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9ca8421b19..abb0c1cb72 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -936,7 +936,7 @@ add_subdirectory("utilities") add_custom_target(copy_files #ALL # uncomment this to copy files every build # 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 # configs, text files COMMAND sed "/@UDF_COMMENT@/d" < ${CMAKE_SOURCE_DIR}/builds/install/misc/firebird.conf.in > ${output_dir}/firebird.conf diff --git a/src/common/config/config.cpp b/src/common/config/config.cpp index 63a7412c2c..ef52a5e91e 100644 --- a/src/common/config/config.cpp +++ b/src/common/config/config.cpp @@ -185,7 +185,7 @@ const Config::ConfigEntry Config::entries[MAX_CONFIG_KEY] = #endif {TYPE_STRING, "UserManager", (ConfigValue) "Srp"}, {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, "WireCrypt", (ConfigValue) NULL}, {TYPE_STRING, "WireCryptPlugin", (ConfigValue) "Arc4"},