diff --git a/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in b/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in index ed40c24c21..24f612d902 100644 --- a/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in +++ b/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in @@ -209,7 +209,7 @@ copyFiles() { # Misc config files cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/ - cp $BuildRootDir/gen/install/misc/aliases.conf $DestDir/ + cp $BuildRootDir/gen/install/misc/databases.conf $DestDir/ cp $BuildRootDir/gen/install/misc/fbintl.conf $DestDir/intl/ # Create links from @libdir@ to install area. diff --git a/builds/install/arch-specific/darwin/install-script b/builds/install/arch-specific/darwin/install-script index 52d9cf4c21..a6037a12a6 100644 --- a/builds/install/arch-specific/darwin/install-script +++ b/builds/install/arch-specific/darwin/install-script @@ -240,10 +240,10 @@ if test -f /tmp/fb-security-database-update2.fdb; then rm -f /tmp/fb-security-database-update2.fdb fi -#Install the saved aliases.conf, if any -echo "Install the saved aliases.conf file" -if test -f /tmp/fb-aliases.conf; then - mv -f /tmp/fb-aliases.conf "$FB_RES/English.lproj/var/aliases.conf" +#Install the saved databases.conf, if any +echo "Install the saved databases.conf file" +if test -f /tmp/fb-databases.conf; then + mv -f /tmp/fb-databases.conf "$FB_RES/English.lproj/var/databases.conf" fi #Install the saved UDF libraries, if any diff --git a/builds/install/arch-specific/darwin/preupgrade-script b/builds/install/arch-specific/darwin/preupgrade-script index 9bcfd8bf11..ffddc4659a 100644 --- a/builds/install/arch-specific/darwin/preupgrade-script +++ b/builds/install/arch-specific/darwin/preupgrade-script @@ -18,8 +18,8 @@ fi if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/security2.fdb"; then mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/security2.fdb" /tmp/fb-security-database-update2.fdb fi -if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/aliases.conf"; then - mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/aliases.conf" /tmp/fb-aliases.conf +if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/databases.conf"; then + mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/databases.conf" /tmp/fb-databases.conf fi for i in /Library/Frameworks/Firebird.framework/Resources/English.lproj/var/UDF/*;do diff --git a/builds/install/arch-specific/freebsd/install.sh.in b/builds/install/arch-specific/freebsd/install.sh.in index a5927c7f0a..addcd63376 100755 --- a/builds/install/arch-specific/freebsd/install.sh.in +++ b/builds/install/arch-specific/freebsd/install.sh.in @@ -301,7 +301,7 @@ copyFiles() { #conf cp $BuiltFBDir/firebird.conf ${TargetDir}@FB_CONFDIR@ - cp $BuiltFBDir/aliases.conf ${TargetDir}@FB_CONFDIR@ + cp $BuiltFBDir/databases.conf ${TargetDir}@FB_CONFDIR@ cp $BuiltFBDir/fbtrace.conf ${TargetDir}@FB_CONFDIR@ chown root:wheel ${TargetDir}@FB_CONFDIR@/*.conf diff --git a/builds/install/arch-specific/hpux/classic/firebirdCS.psf.in b/builds/install/arch-specific/hpux/classic/firebirdCS.psf.in index 6c99fec5f0..a5d93fec7e 100644 --- a/builds/install/arch-specific/hpux/classic/firebirdCS.psf.in +++ b/builds/install/arch-specific/hpux/classic/firebirdCS.psf.in @@ -27,7 +27,7 @@ fileset tag main file -u 0660 -g firebird -o firebird buildroot@prefix@/security2.fdb @prefix@/security2.fdb file -u 0644 -g firebird -o firebird buildroot@prefix@/firebird.conf @prefix@/firebird.conf -file -u 0644 -g firebird -o firebird buildroot@prefix@/aliases.conf @prefix@/aliases.conf +file -u 0644 -g firebird -o firebird buildroot@prefix@/databases.conf @prefix@/databases.conf file -u 0644 -g firebird -o firebird buildroot@prefix@/WhatsNew @prefix@/WhatsNew end # diff --git a/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in b/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in index 511d93f753..5c2863350f 100644 --- a/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in +++ b/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in @@ -206,7 +206,7 @@ copyFiles() { # Misc config files cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/ - cp $BuildRootDir/gen/install/misc/aliases.conf $DestDir/ + cp $BuildRootDir/gen/install/misc/databases.conf $DestDir/ cp $BuildRootDir/gen/install/misc/fbintl.conf $DestDir/intl/ # Create links from @libdir@ to install area. diff --git a/builds/install/arch-specific/hpux/misc/createaliasDB.sh.in b/builds/install/arch-specific/hpux/misc/createaliasDB.sh.in index 893f264cea..cf56858dfa 100644 --- a/builds/install/arch-specific/hpux/misc/createaliasDB.sh.in +++ b/builds/install/arch-specific/hpux/misc/createaliasDB.sh.in @@ -51,7 +51,7 @@ AskQuestion() { #------------------------------------------------------------------------------ # appendAliasEntry -# check to see if an entry already exists in the aliases.conf file +# check to see if an entry already exists in the databases.conf file # if it doesn't append it to the end of the file appendAliasEntry() { @@ -138,7 +138,7 @@ checkAccessToFile() { aliasName=$1 newDB=$2 - AliasFile=@FB_CONFDIR@/aliases.conf + AliasFile=@FB_CONFDIR@/databases.conf checkNameStartsWithSlash $newDB diff --git a/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in b/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in index 9122079f25..657b0ec01b 100644 --- a/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in +++ b/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in @@ -169,7 +169,7 @@ copyFiles() { # Miscellaneous config and stratup files cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/firebird.conf - cp $BuildRootDir/gen/install/misc/aliases.conf $DestDir/ + cp $BuildRootDir/gen/install/misc/databases.conf $DestDir/ # Create links from /usr/lib to install area. diff --git a/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in b/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in index b56abf405a..0ec217419e 100644 --- a/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in +++ b/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in @@ -304,7 +304,7 @@ copyFiles() { #conf cp $BuiltFBDir/firebird.conf ${TargetDir}@FB_CONFDIR@ - cp $BuiltFBDir/aliases.conf ${TargetDir}@FB_CONFDIR@ + cp $BuiltFBDir/databases.conf ${TargetDir}@FB_CONFDIR@ cp $BuiltFBDir/fbtrace.conf ${TargetDir}@FB_CONFDIR@ cp $BuiltFBDir/plugins.conf ${TargetDir}@FB_CONFDIR@ diff --git a/builds/install/arch-specific/netbsd/install.sh.in b/builds/install/arch-specific/netbsd/install.sh.in index 2af8ddd63f..e5f4f62054 100644 --- a/builds/install/arch-specific/netbsd/install.sh.in +++ b/builds/install/arch-specific/netbsd/install.sh.in @@ -197,14 +197,14 @@ cp ${SQLEXTENSIONS} $DestDir/doc/sql.extensions || exit cp $BuiltFBDir/misc/firebird.conf $DestDir/firebird.conf.sample || exit -echo "#" >> $DestDir/aliases.conf.sample -echo "# List of known database aliases" >> $DestDir/aliases.conf.sample -echo "# ------------------------------" >> $DestDir/aliases.conf.sample -echo "#" >> $DestDir/aliases.conf.sample -echo "# Examples:" >> $DestDir/aliases.conf.sample -echo "#" >> $DestDir/aliases.conf.sample -echo "# employee = /$DestDir/examples/employee.fdb" >> $DestDir/aliases.conf.sample -echo "#" >> $DestDir/aliases.conf.sample +echo "#" >> $DestDir/databases.conf.sample +echo "# List of known database aliases" >> $DestDir/databases.conf.sample +echo "# ------------------------------" >> $DestDir/databases.conf.sample +echo "#" >> $DestDir/databases.conf.sample +echo "# Examples:" >> $DestDir/databases.conf.sample +echo "#" >> $DestDir/databases.conf.sample +echo "# employee = /$DestDir/examples/employee.fdb" >> $DestDir/databases.conf.sample +echo "#" >> $DestDir/databases.conf.sample echo Setting ownership and permissions on installed files @@ -284,7 +284,7 @@ chmod ug=rw,o= examples/*.fdb || exit chmod ug=rw,o= help/*.fdb || exit # install the samples if they don't exist -[ -f aliases.conf ] || install -o firebird -g firebird -m 440 aliases.conf.sample aliases.conf +[ -f databases.conf ] || install -o firebird -g firebird -m 440 databases.conf.sample databases.conf [ -f firebird.conf ] || install -o firebird -g firebird -m 440 firebird.conf.sample firebird.conf [ -f security2.fdb ] || install -o firebird -g firebird -m 660 security2.fdb.sample security2.fdb diff --git a/builds/install/arch-specific/solaris/CS/prototype.in b/builds/install/arch-specific/solaris/CS/prototype.in index 67c6cd2d8c..32c7cae42a 100644 --- a/builds/install/arch-specific/solaris/CS/prototype.in +++ b/builds/install/arch-specific/solaris/CS/prototype.in @@ -18,7 +18,7 @@ d none @prefix@ 0751 firebird firebird v CONFIG.prsv @prefix@/security2.fdb=$SRCDIR/security2.fdb 0660 firebird firebird v CONFIG.prsv @prefix@/firebird.conf=$SRCDIR/misc/firebird.conf 0444 firebird firebird -v CONFIG.prsv @prefix@/aliases.conf=$SRCDIR/../../builds/install/misc/aliases.conf.in 0444 firebird firebird +v CONFIG.prsv @prefix@/databases.conf=$SRCDIR/../../builds/install/misc/databases.conf.in 0444 firebird firebird v CONFIG.prsv @prefix@/intl/fbintl.conf=$SRCDIR/misc/fbintl.conf 0644 firebird firebird f none @prefix@/WhatsNew=$SRCDIR/../../doc/WhatsNew 0644 firebird firebird diff --git a/builds/install/arch-specific/solaris/SS/prototype.in b/builds/install/arch-specific/solaris/SS/prototype.in index 5d3a6b266f..b836338d37 100644 --- a/builds/install/arch-specific/solaris/SS/prototype.in +++ b/builds/install/arch-specific/solaris/SS/prototype.in @@ -18,7 +18,7 @@ d none @prefix@ 0755 firebird firebird v CONFIG.prsv @prefix@/security2.fdb=$SRCDIR/security2.fdb 0660 firebird firebird v CONFIG.prsv @prefix@/firebird.conf=$SRCDIR/misc/firebird.conf 0644 firebird firebird -v CONFIG.prsv @prefix@/aliases.conf=$SRCDIR/../../builds/install/misc/aliases.conf.in 0544 firebird firebird +v CONFIG.prsv @prefix@/databases.conf=$SRCDIR/../../builds/install/misc/databases.conf.in 0544 firebird firebird v CONFIG.prsv @prefix@/intl/fbintl.conf=$SRCDIR/misc/fbintl.conf 0644 firebird firebird f none @prefix@/WhatsNew=$SRCDIR/../../doc/WhatsNew 0644 firebird firebird diff --git a/builds/install/arch-specific/win32/BuildExecutableInstall.bat b/builds/install/arch-specific/win32/BuildExecutableInstall.bat index bf49006776..f462c75955 100644 --- a/builds/install/arch-specific/win32/BuildExecutableInstall.bat +++ b/builds/install/arch-specific/win32/BuildExecutableInstall.bat @@ -441,15 +441,15 @@ endlocal :ALIAS_CONF :: Generate a sample aliases file ::=============================== -@echo Creating sample aliases.conf -@echo # > %FB_OUTPUT_DIR%\aliases.conf -@echo # List of known database aliases >> %FB_OUTPUT_DIR%\aliases.conf -@echo # ------------------------------ >> %FB_OUTPUT_DIR%\aliases.conf -@echo # >> %FB_OUTPUT_DIR%\aliases.conf -@echo # Examples: >> %FB_OUTPUT_DIR%\aliases.conf -@echo # >> %FB_OUTPUT_DIR%\aliases.conf -@echo # dummy = c:\data\dummy.fdb >> %FB_OUTPUT_DIR%\aliases.conf -@echo # >> %FB_OUTPUT_DIR%\aliases.conf +@echo Creating sample databases.conf +@echo # > %FB_OUTPUT_DIR%\databases.conf +@echo # List of known database aliases >> %FB_OUTPUT_DIR%\databases.conf +@echo # ------------------------------ >> %FB_OUTPUT_DIR%\databases.conf +@echo # >> %FB_OUTPUT_DIR%\databases.conf +@echo # Examples: >> %FB_OUTPUT_DIR%\databases.conf +@echo # >> %FB_OUTPUT_DIR%\databases.conf +@echo # dummy = c:\data\dummy.fdb >> %FB_OUTPUT_DIR%\databases.conf +@echo # >> %FB_OUTPUT_DIR%\databases.conf ::End of ALIAS_CONF ::----------------- @@ -585,7 +585,7 @@ set FBBUILD_EMB_PACK_ROOT=%FB_ROOT_PATH%\builds\emb_pack_%FB_TARGET_PLATFORM% @mkdir %FBBUILD_EMB_PACK_ROOT% 2>nul @del /s /q %FBBUILD_EMB_PACK_ROOT%\ > nul -for %%v in (aliases.conf firebird.conf firebird.msg) do ( @copy /Y %FB_OUTPUT_DIR%\%%v %FBBUILD_EMB_PACK_ROOT%\%%v > nul) +for %%v in (databases.conf firebird.conf firebird.msg) do ( @copy /Y %FB_OUTPUT_DIR%\%%v %FBBUILD_EMB_PACK_ROOT%\%%v > nul) for %%v in ( doc intl udf ) do (@mkdir %FBBUILD_EMB_PACK_ROOT%\%%v 2>nul) diff --git a/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc b/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc index 0a3bb79b3d..9d72ca78f4 100644 --- a/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc +++ b/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc @@ -736,7 +736,7 @@ if UsingWinNT then else SharedFileArray[26].Filename := ExpandConstant('{sys}')+'FIREBI~1.CPL'; -SharedFileArray[27].Filename := ExpandConstant('{app}')+'aliases.conf'; +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'; diff --git a/builds/install/arch-specific/win32/FirebirdInstall_30.iss b/builds/install/arch-specific/win32/FirebirdInstall_30.iss index 5b55c1721f..553973fc90 100644 --- a/builds/install/arch-specific/win32/FirebirdInstall_30.iss +++ b/builds/install/arch-specific/win32/FirebirdInstall_30.iss @@ -494,7 +494,7 @@ Source: {#FilesDir}\firebird.conf; DestDir: {app}; DestName: firebird.conf.defau Source: {#FilesDir}\firebird.conf; DestDir: {app}; DestName: firebird.conf; Components: ServerComponent; Flags: uninsneveruninstall; check: NoFirebirdConfExists 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}\aliases.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}; 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 @@ -665,7 +665,7 @@ Var // Options for scripted uninstall. CleanUninstall: Boolean; // If /clean is passed to the uninstaller it will delete // user config files - firebird.conf, firebird.log, - // aliases.conf, fbtrace.conf and the security database. + // databases.conf, fbtrace.conf and the security database. SYSDBAName: String; // Name of SYSDBA SYSDBAPassword: String; // SYSDBA password @@ -1056,7 +1056,7 @@ begin //Manually set the sharedfile count of these files. IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.conf', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.log', false); - IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\aliases.conf', false); + IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\databases.conf', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security3.fdb', false); end; @@ -1168,9 +1168,9 @@ begin if CleanUninstall then DeleteFile(GetAppPath+'\firebird.log'); - if DecrementSharedCount(Is64BitInstallMode, GetAppPath+'\aliases.conf') then + if DecrementSharedCount(Is64BitInstallMode, GetAppPath+'\databases.conf') then if CleanUninstall then - DeleteFile(GetAppPath+'\aliases.conf'); + DeleteFile(GetAppPath+'\databases.conf'); if DecrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf') then if CleanUninstall then diff --git a/builds/install/arch-specific/win32/installation_readme.txt b/builds/install/arch-specific/win32/installation_readme.txt index 8be7373f7b..25f5d1dbf8 100644 --- a/builds/install/arch-specific/win32/installation_readme.txt +++ b/builds/install/arch-specific/win32/installation_readme.txt @@ -130,7 +130,7 @@ o If Firebird is running as an application (instead of o Uninstallation leaves five files in the install directory: - - aliases.conf + - databases.conf - firebird.conf - fbtrace.conf - firebird.log diff --git a/builds/install/arch-specific/win32/installation_scripted.txt b/builds/install/arch-specific/win32/installation_scripted.txt index 6e842152e3..c8a06bfcd8 100644 --- a/builds/install/arch-specific/win32/installation_scripted.txt +++ b/builds/install/arch-specific/win32/installation_scripted.txt @@ -398,7 +398,7 @@ Parameters specific to Firebird uninstalls the uninstallation process has completed: firebird.conf - aliases.conf + databases.conf firebird.log security3.fdb fbtrace.conf diff --git a/builds/install/misc/createAliasDB.sh.in b/builds/install/misc/createAliasDB.sh.in index e01de2bb0f..b221356f5d 100644 --- a/builds/install/misc/createAliasDB.sh.in +++ b/builds/install/misc/createAliasDB.sh.in @@ -36,7 +36,7 @@ #------------------------------------------------------------------------------ # appendAliasEntry -# check to see if an entry already exists in the aliases.conf file +# check to see if an entry already exists in the databases.conf file # if it doesn't append it to the end of the file appendAliasEntry() { @@ -121,7 +121,7 @@ checkAccessToFile() { aliasName=$1 newDB=$2 - AliasFile=@FB_CONFDIR@/aliases.conf + AliasFile=@FB_CONFDIR@/databases.conf checkNameStartsWithSlash $newDB appendAliasEntry $aliasName $newDB diff --git a/builds/install/misc/aliases.conf.in b/builds/install/misc/databases.conf.in similarity index 100% rename from builds/install/misc/aliases.conf.in rename to builds/install/misc/databases.conf.in diff --git a/builds/install/misc/firebird.conf.in b/builds/install/misc/firebird.conf.in index ae4a00d7cd..57d9fa8a2b 100644 --- a/builds/install/misc/firebird.conf.in +++ b/builds/install/misc/firebird.conf.in @@ -70,7 +70,7 @@ # To specify access to specific trees, enum all required paths # (for Win32 this may be something like 'C:\DataBase;D:\Mirror', # for unix - '/db;/mnt/mirrordb'). If you choose 'None', then only -# databases listed in aliases.conf can be attached. +# databases listed in databases.conf can be attached. # # Note: simple quotation marks shown above should *NOT* be used when # specifying values and directory path names. Examples: diff --git a/builds/posix/postfix.darwin b/builds/posix/postfix.darwin index 99130245b2..b9d6959db2 100644 --- a/builds/posix/postfix.darwin +++ b/builds/posix/postfix.darwin @@ -105,8 +105,8 @@ darwin_finish_cs_framework: cp ../builds/install/arch-specific/darwin/Readme.txt \ $(FB_FW)/Resources/Readme.txt cp ../gen/install/misc/firebird.conf $(FB_FW)/Resources/English.lproj/var - cp ../builds/install/arch-specific/darwin/aliases.conf.in \ - $(FB_FW)/Resources/English.lproj/var/aliases.conf + cp ../builds/install/arch-specific/darwin/databases.conf.in \ + $(FB_FW)/Resources/English.lproj/var/databases.conf cp ../src/utilities/ntrace/fbtrace.conf \ $(FB_FW)/Resources/English.lproj/var/fbtrace.conf @@ -171,8 +171,8 @@ darwin_finish_ss_framework: cp ../builds/install/arch-specific/darwin/Readme.txt \ $(FB_FW)/Resources/Readme.txt cp ../gen/install/misc/firebird.conf $(FB_FW)/Resources/English.lproj/var - cp ../builds/install/arch-specific/darwin/aliases.conf.in \ - $(FB_FW)/Resources/English.lproj/var/aliases.conf + cp ../builds/install/arch-specific/darwin/databases.conf.in \ + $(FB_FW)/Resources/English.lproj/var/databases.conf cp ../src/utilities/ntrace/fbtrace.conf \ $(FB_FW)/Resources/English.lproj/var/fbtrace.conf darwin_postbuild_target: package diff --git a/configure.ac b/configure.ac index f30ce9b4aa..3adacbc747 100644 --- a/configure.ac +++ b/configure.ac @@ -1114,7 +1114,7 @@ dnl TODO: fix "arch-specific/linux/" paths for common posix scripts with SVN for fb_tgt in $FB_TARGETS; do AC_CONFIG_FILES([ gen/$fb_tgt/firebird/firebird.conf:builds/install/misc/firebird.conf.in -gen/$fb_tgt/firebird/aliases.conf:builds/install/misc/aliases.conf.in +gen/$fb_tgt/firebird/databases.conf:builds/install/misc/databases.conf.in gen/$fb_tgt/firebird/fbtrace.conf:src/utilities/ntrace/fbtrace.conf gen/$fb_tgt/firebird/intl/fbintl.conf:builds/install/misc/fbintl.conf gen/$fb_tgt/firebird/plugins.conf:builds/install/misc/plugins.conf diff --git a/doc/README.raw_devices b/doc/README.raw_devices index a59c957514..7da3a7e484 100644 --- a/doc/README.raw_devices +++ b/doc/README.raw_devices @@ -74,6 +74,6 @@ Database header page information: In all other aspects raw devices do not have known specific in use. - Tip: it's good idea to have raw devices in aliases.conf - in + Tip: it's good idea to have raw devices in databases.conf - in case of HW reconfiguration of your server you will not need to change connection strings. diff --git a/doc/install_windows_manually.txt b/doc/install_windows_manually.txt index 7437b4d3dd..c3e97df043 100644 --- a/doc/install_windows_manually.txt +++ b/doc/install_windows_manually.txt @@ -81,7 +81,7 @@ Uninstallation instclient.exe remove - Delete installation directory. You may wish to keep the log file, security - database, firebird.conf and aliases.conf. + database, firebird.conf and databases.conf. diff --git a/src/common/db_alias.cpp b/src/common/db_alias.cpp index 5bfb0d86e3..a7f806e577 100644 --- a/src/common/db_alias.cpp +++ b/src/common/db_alias.cpp @@ -54,7 +54,7 @@ namespace }; InitInstance databaseDirectoryList; - const char* const ALIAS_FILE = "aliases.conf"; + const char* const ALIAS_FILE = "databases.conf"; void replace_dir_sep(PathName& s) { @@ -272,8 +272,8 @@ static inline bool hasSeparator(const PathName& name) return false; } -// Search for 'alias' in aliases.conf, return its value in 'file' if found. Else set file to alias. -// Returns true if alias is found in aliases.conf. +// Search for 'alias' in databases.conf, return its value in 'file' if found. Else set file to alias. +// Returns true if alias is found in databases.conf. static bool resolveAlias(const PathName& alias, PathName& file, RefPtr* config) { PathName correctedAlias = alias; @@ -346,7 +346,7 @@ static bool setPath(const PathName& filename, PathName& expandedName) } // Full processing of database name -// Returns true if alias was found in aliases.conf +// Returns true if alias was found in databases.conf bool expandDatabaseName(const Firebird::PathName& alias, Firebird::PathName& file, Firebird::RefPtr* config) @@ -357,13 +357,13 @@ bool expandDatabaseName(const Firebird::PathName& alias, } catch (const fatal_exception& ex) { - gds__log("File aliases.conf contains bad data: %s", ex.what()); + gds__log("File databases.conf contains bad data: %s", ex.what()); (Arg::Gds(isc_random) << "Server misconfigured - contact administrator please").raise(); } ReadLockGuard guard(aliasesConf().rwLock, "expandDatabaseName"); - // First of all check in aliases.conf + // First of all check in databases.conf if (resolveAlias(alias, file, config)) { return true; @@ -390,7 +390,7 @@ bool expandDatabaseName(const Firebird::PathName& alias, } } - // Search for correct config in aliases.conf + // Search for correct config in databases.conf if (config) { DbName* db = aliasesConf().dbHash.lookup(file); diff --git a/src/yvalve/PluginManager.cpp b/src/yvalve/PluginManager.cpp index a224c1e4e5..a2e712834c 100644 --- a/src/yvalve/PluginManager.cpp +++ b/src/yvalve/PluginManager.cpp @@ -395,7 +395,7 @@ namespace PluginModule* builtin = NULL; // Provides most of configuration services for plugins, - // except per-database configuration in aliases.conf + // except per-database configuration in databases.conf class ConfiguredPlugin : public RefCntIface { public: @@ -472,7 +472,7 @@ namespace PathName plugName; }; - // Provides per-database configuration from aliases.conf. + // Provides per-database configuration from databases.conf. class FactoryParameter : public RefCntIface { public: