From eac0f27e128302fb26b7f974118983fe0a51947f Mon Sep 17 00:00:00 2001 From: Dmitry Yemanov Date: Mon, 31 May 2021 14:36:48 +0300 Subject: [PATCH] Renamed the package and the security database to v5 --- autogen.sh | 2 +- .../arch-specific/android/AfterUntar.sh | 4 ++-- .../install/arch-specific/darwin/Makefile.in | 6 +++--- .../arch-specific/darwin/install-script | 21 ++++++------------- .../arch-specific/darwin/preupgrade-script | 4 ++-- .../linux/makeInstallImage.sh.in | 2 +- .../arch-specific/win32/FirebirdInstall.iss | 10 ++++----- .../FirebirdInstallEnvironmentChecks.inc | 6 +++--- .../win32/ba/Instalacija_ProcitajMe.txt | 6 +++--- .../win32/cz/instalace_ctime.txt | 6 +++--- .../win32/fr/installation_lisezmoi.txt | 4 ++-- .../win32/installation_readme.txt | 4 ++-- .../win32/installation_scripted.txt | 2 +- .../win32/ru/installation_readme.txt | 6 +++--- builds/install/misc/databases.conf | 2 +- builds/install/misc/firebird.conf | 2 +- .../install/posix-common/posixLibrary.sh.in | 2 +- builds/posix/Makefile.in | 2 +- builds/posix/make.defaults | 2 +- builds/posix/postfix.darwin | 4 ++-- builds/win32/make_all.bat | 2 +- builds/win32/make_boot.bat | 8 +++---- configure.ac | 2 +- doc/README.security_database.txt | 2 +- src/CMakeLists.txt | 2 +- src/common/file_params.h | 2 ++ src/yvalve/PluginManager.cpp | 3 ++- 27 files changed, 56 insertions(+), 62 deletions(-) diff --git a/autogen.sh b/autogen.sh index 79400dd75e..8fb17c42c4 100755 --- a/autogen.sh +++ b/autogen.sh @@ -3,7 +3,7 @@ # Run this to generate all the initial makefiles, etc. # -PKG_NAME=Firebird4 +PKG_NAME=Firebird5 SRCDIR=`dirname $0` if [ -z "$AUTORECONF" ] diff --git a/builds/install/arch-specific/android/AfterUntar.sh b/builds/install/arch-specific/android/AfterUntar.sh index a6193b2784..972d80836d 100644 --- a/builds/install/arch-specific/android/AfterUntar.sh +++ b/builds/install/arch-specific/android/AfterUntar.sh @@ -20,7 +20,7 @@ runAndCheckExit() { runAndCheckExit "Restore messages database" "bin/gbak -rep msg.gbak msg.fdb" runAndCheckExit "Build messages file (firebird.msg)" bin/build_file -runAndCheckExit "Restore security database" "bin/gbak -rep security4.gbak security4.fdb" +runAndCheckExit "Restore security database" "bin/gbak -rep security5.gbak security5.fdb" runAndCheckExit "Restore examples database (employee)" "bin/gbak -rep examples/empbuild/employee.gbak examples/empbuild/employee.fdb" -rm -f msg.gbak msg.fdb security4.gbak examples/empbuild/employee.gbak AfterUntar.sh +rm -f msg.gbak msg.fdb security5.gbak examples/empbuild/employee.gbak AfterUntar.sh diff --git a/builds/install/arch-specific/darwin/Makefile.in b/builds/install/arch-specific/darwin/Makefile.in index 41cd0c2eda..2020ebaccd 100644 --- a/builds/install/arch-specific/darwin/Makefile.in +++ b/builds/install/arch-specific/darwin/Makefile.in @@ -31,7 +31,7 @@ package_firebird: -e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \ -e 's/_REV_NO_/$(FB_REV_NO)/g' \ ../builds/install/arch-specific/darwin/Info.plist \ - > $(ROOT)/gen/$(TARGET)/frameworks/Firebird4.framework/Resources/Info.plist + > $(ROOT)/gen/$(TARGET)/frameworks/Firebird5.framework/Resources/Info.plist sed -e 's/_FB_BUILD_SUFFIX_/$(FB_VER_SUFFIX)/g' \ -e 's/_SMFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_SM)/g' \ -e 's/_MFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_M)/g' \ @@ -39,7 +39,7 @@ package_firebird: -e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \ -e 's/_REV_NO_/$(FB_REV_NO)/g' \ ../builds/install/arch-specific/darwin/Description.plist \ - > $(ROOT)/gen/$(TARGET)/frameworks/Firebird4.framework/Resources/Description.plist + > $(ROOT)/gen/$(TARGET)/frameworks/Firebird5.framework/Resources/Description.plist rm -fr $(ROOT)/gen/$(TARGET)/scripts mkdir $(ROOT)/gen/$(TARGET)/scripts @@ -63,7 +63,7 @@ package_firebird: rm -fr $(TARGET)/packages mkdir $(TARGET)/packages - pkgbuild --root $(ROOT)/gen/$(TARGET)/frameworks/Firebird4.framework \ + pkgbuild --root $(ROOT)/gen/$(TARGET)/frameworks/Firebird5.framework \ --identifier com.firebirdsql.Firebird \ --install-location /Library/Frameworks/Firebird.framework \ --scripts $(ROOT)/gen/$(TARGET)/scripts \ diff --git a/builds/install/arch-specific/darwin/install-script b/builds/install/arch-specific/darwin/install-script index df9709e0e9..48d79d9a4c 100644 --- a/builds/install/arch-specific/darwin/install-script +++ b/builds/install/arch-specific/darwin/install-script @@ -73,7 +73,7 @@ chown -R firebird:firebird "$FB_FW" # set the permissions correctly echo "Set the permissions correctly" chmod 777 "$FB_FW/Resources/" - chmod 660 "$FB_FW/Resources/security4.fdb" + chmod 660 "$FB_FW/Resources/security5.fdb" chmod 444 "$FB_FW/Resources/help/help.fdb" # Remove all older traces of Classic first @@ -92,16 +92,11 @@ if [ -f /etc/xinetd.d/firebird ]; then HUPNEEDED='y' fi -# Install the saved security2 database, if any -echo "Install the saved security2 database" -if test -f /tmp/fb-security-database-update2fdb; then - mv -f /tmp/fb-security-database-update2.fdb "$FB_RES/security2.fdb" -fi # Install the saved security database, if any echo "Install the saved security database" -if test -f /tmp/fb-security-database-update4.fdb; then - mv -f /tmp/fb-security-database-update4.fdb "$FB_RES/security4.fdb" - rm -f /tmp/fb-security-database-update4.fdb +if test -f /tmp/fb-security-database-update5.fdb; then + mv -f /tmp/fb-security-database-update5.fdb "$FB_RES/security5.fdb" + rm -f /tmp/fb-security-database-update5.fdb fi #Install the saved aliases.conf, if any @@ -123,17 +118,13 @@ cp /tmp/UDF_Save/*.* $FB_RES/UDF/ rm -fr /tmp/UDF_save # Test for saved security database -if test -f "$FB_FW/Versions/A/Resources/security2.fdb"; then -echo "Legacy 2.x Security database has been preserved" -fi - -if test -f "$FB_FW/Versions/A/Resources/security4.fdb"; then +if test -f "$FB_RES/security5.fdb"; then echo "Security database has been preserved" fi # Initilise the security database with default user echo "Add SYSDBA and password" -$FB_FW/Versions/A/Resources/bin/gsec -add sysdba -pw masterkey -user sysdba +$FB_RES/bin/gsec -add sysdba -pw masterkey -user sysdba rm -fr /tmp/firebird # And last but not least, start the Server diff --git a/builds/install/arch-specific/darwin/preupgrade-script b/builds/install/arch-specific/darwin/preupgrade-script index 153b5482f9..a47d7e8d03 100644 --- a/builds/install/arch-specific/darwin/preupgrade-script +++ b/builds/install/arch-specific/darwin/preupgrade-script @@ -10,8 +10,8 @@ FB_FW="/Library/Frameworks/Firebird.framework" FB_UDF="/Library/Frameworks/Firebird.framework/Resources/English.lproj/var/UDF" -if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/security3.fdb"; then - mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/security3.fdb" /tmp/fb-security-database-update3.fdb +if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/security5.fdb"; then + mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/security5.fdb" /tmp/fb-security-database-update5.fdb fi if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/aliases.conf"; then diff --git a/builds/install/arch-specific/linux/makeInstallImage.sh.in b/builds/install/arch-specific/linux/makeInstallImage.sh.in index 519662815f..4402bec89a 100644 --- a/builds/install/arch-specific/linux/makeInstallImage.sh.in +++ b/builds/install/arch-specific/linux/makeInstallImage.sh.in @@ -34,7 +34,7 @@ fb_install_prefix=@prefix@ BuildRootDir=.. BuiltFBDir=Release/firebird # Where the just build fb exists. TargetDir=buildroot # Where we want to build the install image -SecurityDatabase=security4.fdb +SecurityDatabase=security5.fdb TomMathBuild="@TOMMATH_BUILD@" TomCryptBuild="@TOMCRYPT_BUILD@" diff --git a/builds/install/arch-specific/win32/FirebirdInstall.iss b/builds/install/arch-specific/win32/FirebirdInstall.iss index 5f39455bd6..b214b2ae9f 100644 --- a/builds/install/arch-specific/win32/FirebirdInstall.iss +++ b/builds/install/arch-specific/win32/FirebirdInstall.iss @@ -460,8 +460,8 @@ Source: {#FilesDir}\fbtrace.conf; DestDir: {app}; DestName: fbtrace.conf; Compon Source: {#FilesDir}\databases.conf; DestDir: {app}; Components: ClientComponent; Flags: uninsneveruninstall onlyifdoesntexist Source: {#FilesDir}\replication.conf; DestDir: {app}; DestName: replication.conf.default; Components: ServerComponent; Source: {#FilesDir}\replication.conf; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist; check: NoReplicationConfExists; -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}\security5.fdb; DestDir: {app}; Destname: security5.fdb.empty; Components: ServerComponent; +Source: {#FilesDir}\security5.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 @@ -1014,7 +1014,7 @@ begin IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.log', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\databases.conf', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf', false); - IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security4.fdb', false); + IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security5.fdb', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\replication.conf', false); InitSecurityDB; @@ -1140,8 +1140,8 @@ begin aStringList.add(appPath+'\firebird.log'); aStringList.add(appPath+'\databases.conf'); aStringList.add(appPath+'\fbtrace.conf'); - aStringList.add(appPath+'\security4.fdb'); - aStringList.add(appPath+'\security4.fdb.old'); + aStringList.add(appPath+'\security5.fdb'); + aStringList.add(appPath+'\security5.fdb.old'); aStringList.add(appPath+'\replication.conf'); for count := 0 to aStringList.count - 1 do begin diff --git a/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc b/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc index 7472d1500e..959a1c8c5c 100644 --- a/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc +++ b/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc @@ -795,7 +795,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}')+'security4.fdb'; +SharedFileArray[30].Filename := ExpandConstant('{app}')+'security5.fdb'; SharedFileArray[31].Filename := ExpandConstant('{app}')+'fbtrace.conf'; SharedFileArray[32].Filename := ExpandConstant('{app}')+'fbsvcmgr.exe'; SharedFileArray[33].Filename := ExpandConstant('{app}')+'fbrmclib.dll'; @@ -1173,7 +1173,7 @@ begin LoadStringFromFile( GetAppPath+'\firebird.conf', FirebirdConfStr ); if pos('SharedDatabase', FirebirdConfStr) > 0 then begin RenameFile(GetAppPath+'\firebird.conf', GetAppPath+'\firebird.conf.preRC1'); - RenameFile(GetAppPath+'\security4.fdb', GetAppPath+'\security4.fdb.preRC1'); + RenameFile(GetAppPath+'\security5.fdb', GetAppPath+'\security5.fdb.preRC1'); end end end; @@ -1181,7 +1181,7 @@ end; function ConfigureAuthentication: boolean; begin - if FileExists(WizardDirValue + '\security4.fdb') then + if FileExists(WizardDirValue + '\security5.fdb') then Result := false else Result := true; diff --git a/builds/install/arch-specific/win32/ba/Instalacija_ProcitajMe.txt b/builds/install/arch-specific/win32/ba/Instalacija_ProcitajMe.txt index bd0c4519db..f42b3e669d 100644 --- a/builds/install/arch-specific/win32/ba/Instalacija_ProcitajMe.txt +++ b/builds/install/arch-specific/win32/ba/Instalacija_ProcitajMe.txt @@ -38,7 +38,7 @@ Pogledajte UNINSTALL sekciju ispod za vise informacija o ovome. Ako ste instalirali beta ili alpha verziju firebird-a, instalacija ce preimenovati firebird.conf i -security4.fdb jer ove datoteke vise nisu kompatibilne. +security5.fdb jer ove datoteke vise nisu kompatibilne. Deployment gds32.dll @@ -69,7 +69,7 @@ Re-instalacija Firebird-a Instalacioni program radi sve sto moze da detektuje i sacuva prethodnu instalaciju. Ako instalacija detektuje -firebird.conf ili security4.fdb onda nece ponuditi +firebird.conf ili security5.fdb onda nece ponuditi opciju da instalira legacy_auth. Niti ce ponuditi opciju da postavi SYSDBA username i password. @@ -128,7 +128,7 @@ o Deinstalacija ostavlja 6 datoteka u install - fbtrace.conf - replication.conf - firebird.log - - security4.fdb + - security5.fdb Ovo je uradjeno namjerno. Ove datoteke su sve potencijalno modifikovane od strane korisnika i mogu diff --git a/builds/install/arch-specific/win32/cz/instalace_ctime.txt b/builds/install/arch-specific/win32/cz/instalace_ctime.txt index c456017287..c6b7d0692e 100644 --- a/builds/install/arch-specific/win32/cz/instalace_ctime.txt +++ b/builds/install/arch-specific/win32/cz/instalace_ctime.txt @@ -38,7 +38,7 @@ viz část ODINSTALACE níže. Máte-li nainstalovanou beta či alpha verzi Firebirdu $MAJOR.$MINOR, instalátor přejmenuje firebird.conf -a security3.fdb, jelikož tyto soubory již nejsou kompatibilní. +a security5.fdb, jelikož tyto soubory již nejsou kompatibilní. Instalace gds32.dll @@ -63,7 +63,7 @@ Reinstalace of Firebird $MAJOR.$MINOR --------------------------- Instalační program dělá vše pro detekci a zachování předchozí instalace. -Jestliže instalátor rozpozná firebird.conf či security3.fdb, nebude +Jestliže instalátor rozpozná firebird.conf či security5.fdb, nebude nabízet možnost instalace legacy_auth. Rovněž nebude nabízet volbu pro nastavení hesla pro SYSDBA. @@ -123,7 +123,7 @@ o Odinstalace v instalační složce zanechá - fbtrace.conf - replication.conf - firebird.log - - security3.fdb + - security5.fdb To je záměr. Všechny tyto soubory jsou potencionálně pozměnitelné uživatelem a diff --git a/builds/install/arch-specific/win32/fr/installation_lisezmoi.txt b/builds/install/arch-specific/win32/fr/installation_lisezmoi.txt index 4a7ad0e9e3..52fe0d870b 100644 --- a/builds/install/arch-specific/win32/fr/installation_lisezmoi.txt +++ b/builds/install/arch-specific/win32/fr/installation_lisezmoi.txt @@ -44,7 +44,7 @@ Il est particulièrement important de vérifier que fbclient.dll et gds32.dll ont été retirés de . Si vous avez installé une version beta ou alpha de Firebird $MAJOR.$MINOR, -l'installeur va renommer firebird.conf et security4.fdb, car ces +l'installeur va renommer firebird.conf et security5.fdb, car ces fichiers ne sont plus compatibles avec la version actuelle. @@ -132,7 +132,7 @@ o La désinstallation laisse six fichiers dans le - fbtrace.conf - replication.conf - firebird.log - - security4.fdb + - security5.fdb Ceci est intentionnel. Ces fichiers sont tous potentiellement modifiables par les utilisateurs et peuvent diff --git a/builds/install/arch-specific/win32/installation_readme.txt b/builds/install/arch-specific/win32/installation_readme.txt index 660f5260a8..a75c2b0573 100644 --- a/builds/install/arch-specific/win32/installation_readme.txt +++ b/builds/install/arch-specific/win32/installation_readme.txt @@ -52,7 +52,7 @@ Re-installation of Firebird The binary installer does its best to detect and preserve a previous install. If the installer detects -firebird.conf or security4.fdb it will not offer the +firebird.conf or security5.fdb it will not offer the option to set the SYSDBA username and password. @@ -112,7 +112,7 @@ o Uninstallation leaves six files in the install - fbtrace.conf - replication.conf - firebird.log - - security4.fdb + - security5.fdb This is intentional. These files are all potentially modifiable by users and may be required diff --git a/builds/install/arch-specific/win32/installation_scripted.txt b/builds/install/arch-specific/win32/installation_scripted.txt index 5ca49954d1..ceaf7d4eef 100644 --- a/builds/install/arch-specific/win32/installation_scripted.txt +++ b/builds/install/arch-specific/win32/installation_scripted.txt @@ -147,7 +147,7 @@ Parameters specific to Firebird uninstalls firebird.conf databases.conf firebird.log - security3.fdb + security5.fdb fbtrace.conf replication.conf diff --git a/builds/install/arch-specific/win32/ru/installation_readme.txt b/builds/install/arch-specific/win32/ru/installation_readme.txt index 6c07302288..de53d93ac9 100644 --- a/builds/install/arch-specific/win32/ru/installation_readme.txt +++ b/builds/install/arch-specific/win32/ru/installation_readme.txt @@ -36,7 +36,7 @@ o Установка из пакетного (bat) файла каталога . Если у вас установлена Альфа или Бета версия Firebird $MAJOR.$MINOR, -то программа установки переименует файлы firebird.conf и security4.fdb +то программа установки переименует файлы firebird.conf и security5.fdb из-за их несовместимости с устанавливаемой версией. @@ -67,7 +67,7 @@ MS VC runtime версии 10.0 установлены в системе. Программа установки пытается обнаружить и сохранить ранее установленную версию Firebird. Если программа установки обнаруживает файлы firebird.conf -или security4.fdb, то некоторые настройки авторизации могут быть недоступны, +или security5.fdb, то некоторые настройки авторизации могут быть недоступны, в частности возможность установить пароль пользователя SYSDBA. @@ -124,7 +124,7 @@ o Деинсталлятор оставляет следующие файлы в - fbtrace.conf - replication.conf - firebird.log - - security4.fdb + - security5.fdb Это происходит намеренно. Эти файлы потенциально могут быть изменены пользователем и могут diff --git a/builds/install/misc/databases.conf b/builds/install/misc/databases.conf index cc5b62de8a..2f7da8e62f 100644 --- a/builds/install/misc/databases.conf +++ b/builds/install/misc/databases.conf @@ -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)/security4.fdb +security.db = $(dir_secDb)/security5.fdb { RemoteAccess = false DefaultDbCachePages = 256 diff --git a/builds/install/misc/firebird.conf b/builds/install/misc/firebird.conf index b7cd8d7472..7670d0f6c0 100644 --- a/builds/install/misc/firebird.conf +++ b/builds/install/misc/firebird.conf @@ -1030,7 +1030,7 @@ # # Type: string (pathname) # -#SecurityDatabase = $(dir_secDb)/security4.fdb +#SecurityDatabase = $(dir_secDb)/security5.fdb # ============================== diff --git a/builds/install/posix-common/posixLibrary.sh.in b/builds/install/posix-common/posixLibrary.sh.in index f499f93e5a..f7ece7a203 100644 --- a/builds/install/posix-common/posixLibrary.sh.in +++ b/builds/install/posix-common/posixLibrary.sh.in @@ -85,7 +85,7 @@ OrigPasswd="" TmpFile="" MANIFEST_TXT="" Manifest=manifest.txt -SecurityDatabase=security4.fdb +SecurityDatabase=security5.fdb DefaultLibrary=libfbclient UninstallScript=FirebirdUninstall.sh XINETD=/etc/xinetd.d/ diff --git a/builds/posix/Makefile.in b/builds/posix/Makefile.in index bb4ceb12fb..0c60873452 100644 --- a/builds/posix/Makefile.in +++ b/builds/posix/Makefile.in @@ -413,7 +413,7 @@ $(GPRE): $(GPRE_Objects) $(COMMON_LIB) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..) HELP_FDB = $(FIREBIRD)/help/help.fdb -SECURITY_FDB = $(FIREBIRD)/security4.fdb +SECURITY_FDB = $(FIREBIRD)/security5.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 6dfd3ab118..d96e89053f 100755 --- a/builds/posix/make.defaults +++ b/builds/posix/make.defaults @@ -397,7 +397,7 @@ FBMGR_BIN = $(BIN)/fbmgr.bin$(EXEC_EXT) INSTREG = $(BIN)/instreg$(EXEC_EXT) INSTSVC = $(BIN)/instsvc$(EXEC_EXT) -SECURITY_FDB = $(FIREBIRD)/security4.fdb +SECURITY_FDB = $(FIREBIRD)/security5.fdb # From qli QLI = $(BIN)/qli$(EXEC_EXT) diff --git a/builds/posix/postfix.darwin b/builds/posix/postfix.darwin index 9c00191f65..a0412dc303 100644 --- a/builds/posix/postfix.darwin +++ b/builds/posix/postfix.darwin @@ -21,7 +21,7 @@ TARGET ?= Release ICU_VERS = icu54 ICU_LOC ?= $(HOME)/$(ICU_VERS)/icu/source/lib/ -FB_FW = ../gen/$(TARGET)/frameworks/Firebird4.framework +FB_FW = ../gen/$(TARGET)/frameworks/Firebird5.framework all: framework @@ -53,7 +53,7 @@ framework: cp ../gen/$(TARGET)/firebird/intl/fbintl.conf $(FB_FW)/Versions/A/Resources/intl/fbintl.conf #chmod a+rx $(FB_FW)/Versions/A/Resources/intl/fbintl cp -r ../gen/$(TARGET)/firebird/plugins $(FB_FW)/Versions/A/Resources/plugins - cp ../gen/$(TARGET)/firebird/security4.fdb $(FB_FW)/Versions/A/Resources/security4.fdb + cp ../gen/$(TARGET)/firebird/security5.fdb $(FB_FW)/Versions/A/Resources/security5.fdb cp ../gen/$(TARGET)/firebird/firebird.msg $(FB_FW)/Versions/A/Resources/firebird.msg cp -r ../gen/$(TARGET)/firebird/help $(FB_FW)/Versions/A/Resources/help cp -r ../gen/$(TARGET)/firebird/tzdata $(FB_FW)/Versions/A/Resources/tzdata diff --git a/builds/win32/make_all.bat b/builds/win32/make_all.bat index f4df4bf15e..3a22db4c48 100644 --- a/builds/win32/make_all.bat +++ b/builds/win32/make_all.bat @@ -78,7 +78,7 @@ for %%v in (gpre_boot build_msg codes) do ( @copy %FB_ROOT_PATH%\builds\install\misc\IDPLicense.txt %FB_OUTPUT_DIR% >nul :: DATABASES -@copy %FB_GEN_DIR%\dbs\security4.FDB %FB_OUTPUT_DIR%\security4.fdb >nul +@copy %FB_GEN_DIR%\dbs\security5.FDB %FB_OUTPUT_DIR%\security5.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 5c9445ea26..53dc4b6a01 100644 --- a/builds/win32/make_boot.bat +++ b/builds/win32/make_boot.bat @@ -306,11 +306,11 @@ goto :EOF @rmdir /s /q %FB_GEN_DIR%\dbs 2>nul @mkdir %FB_GEN_DIR%\dbs 2>nul -@echo Create security4.fdb... -@echo create database '%FB_GEN_DB_DIR%\dbs\security4.fdb'; | "%FB_BIN_DIR%\isql" -q +@echo Create security5.fdb... +@echo create database '%FB_GEN_DB_DIR%\dbs\security5.fdb'; | "%FB_BIN_DIR%\isql" -q @echo Apply 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\security4.fdb %FB_GEN_DIR%\dbs\security.fdb > nul +@"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/security5.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql +@copy %FB_GEN_DIR%\dbs\security5.fdb %FB_GEN_DIR%\dbs\security.fdb > nul @echo Restore metadata.gbak... @%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 0a3de368ac..9b40be4310 100644 --- a/configure.ac +++ b/configure.ac @@ -1419,7 +1419,7 @@ AC_OUTPUT dnl Print out the build configuration (the most interesting thing) echo echo -echo The Firebird4 package has been configured with the following options: +echo The Firebird5 package has been configured with the following options: echo case $DEVEL_FLG in diff --git a/doc/README.security_database.txt b/doc/README.security_database.txt index b6ce4d3e70..7ee96c6340 100644 --- a/doc/README.security_database.txt +++ b/doc/README.security_database.txt @@ -1,6 +1,6 @@ Initializing the Security Database ---------------------------------- -The security database (security4.fdb) has no predefined users. This is intentional. +The security database (security5.fdb) has no predefined users. This is intentional. Having user with well known predefined password and full access rights is serious security risk. Firebird starting with version 3.0 does not require presence of SYSDBA user. One can use another name diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b890c4ea8b..8f10dc3bda 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -906,7 +906,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}/security4.fdb + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/security.fdb ${output_dir}/security5.fdb COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/help.fdb ${output_dir}/help/help.fdb # configs, text files COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/misc/firebird.conf ${output_dir}/firebird.conf diff --git a/src/common/file_params.h b/src/common/file_params.h index 0cd4ecc1c4..b15347da8f 100644 --- a/src/common/file_params.h +++ b/src/common/file_params.h @@ -81,6 +81,8 @@ static const char MSG_FILE_LANG[] = "intl/%.10s.msg"; static const char* const LOCKDIR = "firebird"; // created in WORKFILE static const char* const LOGFILE = FB_LOGFILENAME; static const char* const MSG_FILE = "firebird.msg"; +static const char* const SECURITY_DB = "security5.fdb"; + // Keep in sync with MSG_FILE_LANG const int LOCALE_MAX = 10; diff --git a/src/yvalve/PluginManager.cpp b/src/yvalve/PluginManager.cpp index 2dcb9c561b..2004c6087b 100644 --- a/src/yvalve/PluginManager.cpp +++ b/src/yvalve/PluginManager.cpp @@ -42,6 +42,7 @@ #include "../common/classes/GenericMap.h" #include "../common/db_alias.h" #include "../common/dllinst.h" +#include "../common/file_params.h" #include "../yvalve/config/os/config_root.h" @@ -1182,7 +1183,7 @@ public: cache[i] = fb_utils::getPrefix(i, ""); } - db = fb_utils::getPrefix(IConfigManager::DIR_SECDB, "security4.fdb"); + db = fb_utils::getPrefix(IConfigManager::DIR_SECDB, SECURITY_DB); } const char* getDir(unsigned code)