diff --git a/autogen.sh b/autogen.sh index 8fb17c42c4..f800af9a7e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -3,7 +3,7 @@ # Run this to generate all the initial makefiles, etc. # -PKG_NAME=Firebird5 +PKG_NAME=Firebird6 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 521570d32e..4c4f554e77 100644 --- a/builds/install/arch-specific/android/AfterUntar.sh +++ b/builds/install/arch-specific/android/AfterUntar.sh @@ -19,8 +19,8 @@ runAndCheckExit() { } runAndCheckExit "Build messages file (firebird.msg)" "./build_file -f firebird.msg" -runAndCheckExit "Creating security database" "echo create database \'security5.fdb\'^ | ./isql -q -term ^" -runAndCheckExit "Creating security database metadata" "./isql -q security5.fdb -i security.sql" +runAndCheckExit "Creating security database" "echo create database \'security6.fdb\'^ | ./isql -q -term ^" +runAndCheckExit "Creating security database metadata" "./isql -q security6.fdb -i security.sql" #runAndCheckExit "Restore examples database (employee)" "(cd examples/empbuild ; ../.././isql -q -i ../../employe2.sql)" rm -f security.sql employe2.sql ./build_file AfterUntar.sh diff --git a/builds/install/arch-specific/android/BuildFinalPackage.sh b/builds/install/arch-specific/android/BuildFinalPackage.sh index 2a7386490c..758f52c550 100755 --- a/builds/install/arch-specific/android/BuildFinalPackage.sh +++ b/builds/install/arch-specific/android/BuildFinalPackage.sh @@ -46,7 +46,7 @@ $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir && $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir/firebird && ./common_test --log_level=all && ./libEngine13_test --log_level=all)" $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir/firebird && ./AfterUntar.sh)" $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName pull $AndroidDir/firebird/firebird.msg gen/Release/firebird/ -$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName pull $AndroidDir/firebird/security5.fdb gen/Release/firebird/ +$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName pull $AndroidDir/firebird/security6.fdb gen/Release/firebird/ #$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName pull $AndroidDir/firebird/examples/empbuild/employe2.fdb gen/Release/firebird/examples/empbuild/ $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(rm -rf $AndroidDir)" diff --git a/builds/install/arch-specific/darwin/Makefile.in b/builds/install/arch-specific/darwin/Makefile.in index fbf225d3c2..1b11b6493a 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/Firebird5.framework/Resources/Info.plist + > $(ROOT)/gen/$(TARGET)/frameworks/Firebird6.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/Firebird5.framework/Resources/Description.plist + > $(ROOT)/gen/$(TARGET)/frameworks/Firebird6.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/Firebird5.framework \ + pkgbuild --root $(ROOT)/gen/$(TARGET)/frameworks/Firebird6.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 f1074c7e8f..bd67a80dbd 100644 --- a/builds/install/arch-specific/darwin/install-script +++ b/builds/install/arch-specific/darwin/install-script @@ -74,7 +74,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/security5.fdb" + chmod 660 "$FB_FW/Resources/security6.fdb" # Remove all older traces of Classic first echo "Remove all older traces of Classic first" @@ -95,7 +95,7 @@ fi # Install the saved security database, if any echo "Install the saved security database" if test -f /tmp/fb-security-database-update5.fdb; then - mv -f /tmp/fb-security-database-update5.fdb "$FB_RES/security5.fdb" + mv -f /tmp/fb-security-database-update5.fdb "$FB_RES/security6.fdb" rm -f /tmp/fb-security-database-update5.fdb fi @@ -118,7 +118,7 @@ cp /tmp/UDF_Save/*.* $FB_RES/UDF/ rm -fr /tmp/UDF_save # Test for saved security database -if test -f "$FB_RES/security5.fdb"; then +if test -f "$FB_RES/security6.fdb"; then echo "Security database has been preserved" fi diff --git a/builds/install/arch-specific/darwin/preupgrade-script b/builds/install/arch-specific/darwin/preupgrade-script index a47d7e8d03..ecde755fef 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/security5.fdb"; then - mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/security5.fdb" /tmp/fb-security-database-update5.fdb +if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/security6.fdb"; then + mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/security6.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 bc8c9af202..4923d0d0ca 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=security5.fdb +SecurityDatabase=security6.fdb TomMathBuild="@TOMMATH_BUILD@" TomCryptBuild="@TOMCRYPT_BUILD@" OBJDUMP=@OBJDUMP@ diff --git a/builds/install/arch-specific/win32/FirebirdInstall.iss b/builds/install/arch-specific/win32/FirebirdInstall.iss index e29e6fba87..9abb36bf8e 100644 --- a/builds/install/arch-specific/win32/FirebirdInstall.iss +++ b/builds/install/arch-specific/win32/FirebirdInstall.iss @@ -488,8 +488,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}\security5.fdb; DestDir: {app}; Destname: security5.fdb.empty; Components: ServerComponent; -Source: {#FilesDir}\security5.fdb; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist +Source: {#FilesDir}\security6.fdb; DestDir: {app}; Destname: security6.fdb.empty; Components: ServerComponent; +Source: {#FilesDir}\security6.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 @@ -1058,7 +1058,7 @@ begin IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.log', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\databases.conf', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf', false); - IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security5.fdb', false); + IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security6.fdb', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\replication.conf', false); InitSecurityDB; @@ -1184,8 +1184,8 @@ begin aStringList.add(appPath+'\firebird.log'); aStringList.add(appPath+'\databases.conf'); aStringList.add(appPath+'\fbtrace.conf'); - aStringList.add(appPath+'\security5.fdb'); - aStringList.add(appPath+'\security5.fdb.old'); + aStringList.add(appPath+'\security6.fdb'); + aStringList.add(appPath+'\security6.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 bb922c9378..9b15c44963 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}')+'security5.fdb'; +SharedFileArray[30].Filename := ExpandConstant('{app}')+'security6.fdb'; SharedFileArray[31].Filename := ExpandConstant('{app}')+'fbtrace.conf'; SharedFileArray[32].Filename := ExpandConstant('{app}')+'fbsvcmgr.exe'; SharedFileArray[33].Filename := ExpandConstant('{app}')+'fbrmclib.dll'; @@ -1201,7 +1201,7 @@ begin LoadStringFromFile( GetAppPath+'\firebird.conf', FirebirdConfStr ); if pos('SharedDatabase', FirebirdConfStr) > 0 then begin RenameFile(GetAppPath+'\firebird.conf', GetAppPath+'\firebird.conf.preRC1'); - RenameFile(GetAppPath+'\security5.fdb', GetAppPath+'\security5.fdb.preRC1'); + RenameFile(GetAppPath+'\security6.fdb', GetAppPath+'\security6.fdb.preRC1'); end end end; @@ -1213,7 +1213,7 @@ begin if IsNotServerInstall then Result := false else - if FileExists(WizardDirValue + '\security5.fdb') then + if FileExists(WizardDirValue + '\security6.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 f42b3e669d..558283c1db 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 -security5.fdb jer ove datoteke vise nisu kompatibilne. +security6.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 security5.fdb onda nece ponuditi +firebird.conf ili security6.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 - - security5.fdb + - security6.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 c6b7d0692e..02a436bec4 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 security5.fdb, jelikož tyto soubory již nejsou kompatibilní. +a security6.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 security5.fdb, nebude +Jestliže instalátor rozpozná firebird.conf či security6.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 - - security5.fdb + - security6.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 52fe0d870b..55adea1aaa 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 security5.fdb, car ces +l'installeur va renommer firebird.conf et security6.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 - - security5.fdb + - security6.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 a75c2b0573..7a3d7eb701 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 security5.fdb it will not offer the +firebird.conf or security6.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 - - security5.fdb + - security6.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 ceaf7d4eef..d7d68a8787 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 - security5.fdb + security6.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 de53d93ac9..1873abbc66 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 и security5.fdb +то программа установки переименует файлы firebird.conf и security6.fdb из-за их несовместимости с устанавливаемой версией. @@ -67,7 +67,7 @@ MS VC runtime версии 10.0 установлены в системе. Программа установки пытается обнаружить и сохранить ранее установленную версию Firebird. Если программа установки обнаруживает файлы firebird.conf -или security5.fdb, то некоторые настройки авторизации могут быть недоступны, +или security6.fdb, то некоторые настройки авторизации могут быть недоступны, в частности возможность установить пароль пользователя SYSDBA. @@ -124,7 +124,7 @@ o Деинсталлятор оставляет следующие файлы в - fbtrace.conf - replication.conf - firebird.log - - security5.fdb + - security6.fdb Это происходит намеренно. Эти файлы потенциально могут быть изменены пользователем и могут diff --git a/builds/install/misc/databases.conf b/builds/install/misc/databases.conf index 2f7da8e62f..505e183060 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)/security5.fdb +security.db = $(dir_secDb)/security6.fdb { RemoteAccess = false DefaultDbCachePages = 256 diff --git a/builds/install/misc/firebird.conf b/builds/install/misc/firebird.conf index e52436d91b..c7ce2d8214 100644 --- a/builds/install/misc/firebird.conf +++ b/builds/install/misc/firebird.conf @@ -1100,7 +1100,7 @@ # # Type: string (pathname) # -#SecurityDatabase = $(dir_secDb)/security5.fdb +#SecurityDatabase = $(dir_secDb)/security6.fdb # ============================ diff --git a/builds/install/posix-common/posixLibrary.sh.in b/builds/install/posix-common/posixLibrary.sh.in index 922171dc70..2318d5f259 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=security5.fdb +SecurityDatabase=security6.fdb DefaultLibrary=libfbclient UninstallScript=FirebirdUninstall.sh XINETD=/etc/xinetd.d/ diff --git a/builds/posix/Makefile.in b/builds/posix/Makefile.in index 737446b39f..bea44bfea1 100644 --- a/builds/posix/Makefile.in +++ b/builds/posix/Makefile.in @@ -490,7 +490,7 @@ gpre: $(GPRE) databases $(GPRE): $(GPRE_Objects) $(COMMON_LIB) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) -SECURITY_FDB = $(FIREBIRD)/security5.fdb +SECURITY_FDB = $(FIREBIRD)/security6.fdb SECURITY_TMP = security.tmp databases: yachts.lnk $(SECURITY_FDB) diff --git a/builds/posix/make.defaults b/builds/posix/make.defaults index 2bbf905236..59bc3c8900 100755 --- a/builds/posix/make.defaults +++ b/builds/posix/make.defaults @@ -420,7 +420,7 @@ FBGUARD = $(BIN)/fbguard$(EXEC_EXT) INSTREG = $(BIN)/instreg$(EXEC_EXT) INSTSVC = $(BIN)/instsvc$(EXEC_EXT) -SECURITY_FDB = $(FIREBIRD)/security5.fdb +SECURITY_FDB = $(FIREBIRD)/security6.fdb # From isql ISQL = $(BIN)/isql$(EXEC_EXT) diff --git a/builds/posix/postfix.darwin b/builds/posix/postfix.darwin index a311a65fe8..f4f31e7efb 100644 --- a/builds/posix/postfix.darwin +++ b/builds/posix/postfix.darwin @@ -19,7 +19,7 @@ # 2 Oct 2002, Nickolay Samofatov - Major Cleanup TARGET ?= Release -FB_FW = ../gen/$(TARGET)/frameworks/Firebird5.framework +FB_FW = ../gen/$(TARGET)/frameworks/Firebird6.framework all: framework @@ -49,7 +49,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/security5.fdb $(FB_FW)/Versions/A/Resources/security5.fdb + cp ../gen/$(TARGET)/firebird/security6.fdb $(FB_FW)/Versions/A/Resources/security6.fdb cp ../gen/$(TARGET)/firebird/firebird.msg $(FB_FW)/Versions/A/Resources/firebird.msg cp -r ../gen/$(TARGET)/firebird/tzdata $(FB_FW)/Versions/A/Resources/tzdata mkdir -p $(FB_FW)/Resources/doc diff --git a/builds/win32/make_all.bat b/builds/win32/make_all.bat index 2c3ebebc7b..622507522a 100644 --- a/builds/win32/make_all.bat +++ b/builds/win32/make_all.bat @@ -85,7 +85,7 @@ for %%v in (gpre_boot build_msg common_test engine_test) do ( copy %FB_ROOT_PATH%\src\plugins\udr_engine\udr_engine.conf %FB_OUTPUT_DIR%\plugins\udr_engine.conf >nul :: DATABASES - copy %FB_GEN_DIR%\dbs\security5.FDB %FB_OUTPUT_DIR%\security5.fdb >nul + copy %FB_GEN_DIR%\dbs\security6.FDB %FB_OUTPUT_DIR%\security6.fdb >nul :: DOCS copy %FB_ROOT_PATH%\*.md %FB_OUTPUT_DIR%\doc\ >nul diff --git a/builds/win32/make_boot.bat b/builds/win32/make_boot.bat index 3cbe542a25..196980dec1 100644 --- a/builds/win32/make_boot.bat +++ b/builds/win32/make_boot.bat @@ -112,8 +112,8 @@ for %%v in (firebird plugins) do ( if "!ERRLEV!"=="1" goto :END :: copy security db if not exists already - if not exist %FB_BIN_DIR%\security5.fdb ( - copy %FB_GEN_DIR%\dbs\security5.fdb %FB_BIN_DIR% + if not exist %FB_BIN_DIR%\security6.fdb ( + copy %FB_GEN_DIR%\dbs\security6.fdb %FB_BIN_DIR% ) ::======= @@ -270,17 +270,17 @@ goto :EOF @rmdir /s /q %FB_GEN_DIR%\dbs 2>nul @mkdir %FB_GEN_DIR%\dbs 2>nul -@echo Create security5.fdb... -@echo create database '%FB_GEN_DB_DIR%\dbs\security5.fdb'; | "%FB_BIN_DIR%\isql" -q > nul +@echo Create security6.fdb... +@echo create database '%FB_GEN_DB_DIR%\dbs\security6.fdb'; | "%FB_BIN_DIR%\isql" -q > nul if errorlevel 1 call :boot2 databases & goto :EOF @echo Apply security.sql... -@"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/security5.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql > nul +@"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/security6.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql > nul if errorlevel 1 call :boot2 databases & goto :EOF -@mklink %FB_GEN_DIR%\dbs\security.fdb %FB_GEN_DIR%\dbs\security5.fdb > nul +@mklink %FB_GEN_DIR%\dbs\security.fdb %FB_GEN_DIR%\dbs\security6.fdb > nul if errorlevel 1 ( - @copy %FB_GEN_DIR%\dbs\security5.fdb %FB_GEN_DIR%\dbs\security.fdb > nul + @copy %FB_GEN_DIR%\dbs\security6.fdb %FB_GEN_DIR%\dbs\security.fdb > nul ) if errorlevel 1 call :boot2 databases & goto :EOF diff --git a/configure.ac b/configure.ac index 8cdabafd15..17e7711160 100644 --- a/configure.ac +++ b/configure.ac @@ -1649,7 +1649,7 @@ AC_OUTPUT dnl Print out the build configuration (the most interesting thing) echo echo -echo The Firebird5 package has been configured with the following options: +echo The Firebird6 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 7ee96c6340..bef659f621 100644 --- a/doc/README.security_database.txt +++ b/doc/README.security_database.txt @@ -1,6 +1,6 @@ Initializing the Security Database ---------------------------------- -The security database (security5.fdb) has no predefined users. This is intentional. +The security database (security6.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 fffc3d0d7b..3b96d7d528 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -877,7 +877,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}/security5.fdb + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/security.fdb ${output_dir}/security6.fdb # configs, text files COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/misc/firebird.conf ${output_dir}/firebird.conf COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/misc/databases.conf ${output_dir}/databases.conf diff --git a/src/common/file_params.h b/src/common/file_params.h index 64eabe9a01..414e9149e0 100644 --- a/src/common/file_params.h +++ b/src/common/file_params.h @@ -93,7 +93,7 @@ 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"; +static const char* const SECURITY_DB = "security6.fdb"; // Keep in sync with MSG_FILE_LANG const int LOCALE_MAX = 10;