-diff -U 3 -H -d -r -N -- Firebird-2.1.1.17910-0~/builds/install/misc/createAliasDB.sh.in Firebird-2.1.1.17910-0/builds/install/misc/createAliasDB.sh.in
---- Firebird-2.1.1.17910-0~/builds/install/misc/createAliasDB.sh.in 2005-08-16 12:03:22.000000000 +0200
-+++ Firebird-2.1.1.17910-0/builds/install/misc/createAliasDB.sh.in 2008-08-23 15:52:25.000000000 +0200
-@@ -125,7 +125,7 @@
- aliasName=$1
- newDB=$2
+--- Firebird-2.5.4.26856-0/src/jrd/gds.cpp.orig 2015-05-29 20:19:05.329013419 +0200
++++ Firebird-2.5.4.26856-0/src/jrd/gds.cpp 2015-05-29 20:33:36.775643514 +0200
+@@ -1754,7 +1754,13 @@
-- AliasFile=$FBRootDir/aliases.conf
-+ AliasFile=/etc/firebird/aliases.conf
+ GDS_init_prefix();
-
- checkNameStartsWithSlash $newDB
-diff -U 3 -H -d -r -N -- Firebird-2.1.1.17910-0~/src/jrd/db_alias.cpp Firebird-2.1.1.17910-0/src/jrd/db_alias.cpp
---- Firebird-2.1.1.17910-0~/src/jrd/db_alias.cpp 2006-05-19 17:16:45.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/jrd/db_alias.cpp 2008-08-23 17:58:51.000000000 +0200
-@@ -45,8 +45,7 @@
-
- bool ResolveDatabaseAlias(const string& alias, string& database)
- {
-- string alias_filename;
-- Firebird::Prefix(alias_filename, ALIAS_FILE);
-+ string alias_filename = "/etc/firebird/aliases.conf";
- ConfigFile aliasConfig(false);
- aliasConfig.setConfigFilePath(alias_filename);
-
-diff -U 3 -H -d -r -N -- Firebird-2.1.1.17910-0~/src/jrd/gds.cpp Firebird-2.1.1.17910-0/src/jrd/gds.cpp
---- Firebird-2.1.1.17910-0~/src/jrd/gds.cpp 2008-08-23 13:50:58.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/jrd/gds.cpp 2008-08-23 18:02:40.000000000 +0200
-@@ -1090,7 +1090,7 @@
- while (true) {
- if (trace_file_handle == INVALID_HANDLE_VALUE) {
- TEXT name[MAXPATHLEN];
-- gds__prefix(name, LOGFILE);
-+ sprintf(name, "/var/log/%s", LOGFILE);
- // We do not care to close this file.
- // It will be closed automatically when our process terminates.
- trace_file_handle = CreateFile(name, GENERIC_WRITE,
-@@ -1116,7 +1116,7 @@
- TEXT name[MAXPATHLEN];
-
- // Note: signal-safe code
-- gds__prefix(name, LOGFILE);
-+ sprintf(name, "/var/log/%s", LOGFILE);
- int file = open(name, O_CREAT | O_APPEND | O_WRONLY, 0660);
- if (file == -1)
- return;
-@@ -1227,7 +1227,7 @@
- now = time((time_t *)0);
- #endif
-
-- gds__prefix(name, LOGFILE);
-+ sprintf(name, "/var/log/%s", LOGFILE);
-
- #ifdef WIN_NT
- WaitForSingleObject(trace_mutex_handle, INFINITE);
-@@ -1283,7 +1283,7 @@
- now = time((time_t *)0);
- #endif
-
-- gds__prefix(name, LOGFILE);
-+ sprintf(name, "/var/log/%s", LOGFILE);
-
- const int oldmask = umask(0111);
- #ifdef WIN_NT
-@@ -1844,8 +1844,13 @@
- fb_utils::snprintf(buf, MAXPATHLEN, root, fbEmbeddedRoot);
- root = buf;
- #endif
+- strcpy(string, fb_prefix_lock); // safe - no BO
+ const char *lockdir = "/var/lib/firebird";
+ struct stat sb;
+ if (stat(lockdir, &sb) == 0 && (sb.st_mode & S_IFMT) == S_IFDIR)
+ strcpy(string, lockdir);
+ else
+ strcpy(string, fb_prefix_lock); // safe - no BO
-
-- strcpy(string, fb_prefix_lock); // safe - no BO
- safe_concat_path(string, root);
++
+ iscSafeConcatPath(string, root);
}
- #endif
---- Firebird-2.1.3.18185-0/src/jrd/jrd_pwd.h.orig 2008-04-03 19:00:51.000000000 +0200
-+++ Firebird-2.1.3.18185-0/src/jrd/jrd_pwd.h 2009-09-19 05:52:40.000000000 +0200
-@@ -60,7 +60,7 @@
- "security2.fdb";
- #endif
-- gds__prefix(path_buffer, USER_INFO_NAME);
-+ gds__prefix_lock(path_buffer, USER_INFO_NAME);
- }
-
- static void initialize();
-diff -U 3 -H -d -r -N -- Firebird-2.1.1.17910-0~/src/jrd/os/config_root.h Firebird-2.1.1.17910-0/src/jrd/os/config_root.h
---- Firebird-2.1.1.17910-0~/src/jrd/os/config_root.h 2007-04-05 14:47:15.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/jrd/os/config_root.h 2008-08-23 16:09:04.000000000 +0200
-@@ -83,7 +83,7 @@
+--- Firebird-2.5.0.26074-0/src/jrd/os/config_root.h.orig 2010-09-08 10:43:20.000000000 +0200
++++ Firebird-2.5.0.26074-0/src/jrd/os/config_root.h 2010-10-28 08:36:33.139734339 +0200
+@@ -91,7 +91,7 @@
{
+ GetInstallDir();
GetRoot();
- install_dir = root_dir;
- config_file = root_dir + string(CONFIG_FILE);
+ config_file = "/etc/firebird/" + string(CONFIG_FILE);
}
-
-diff -U 3 -H -d -r -N -- Firebird-2.1.1.17910-0~/src/jrd/svc.cpp Firebird-2.1.1.17910-0/src/jrd/svc.cpp
---- Firebird-2.1.1.17910-0~/src/jrd/svc.cpp 2008-05-27 11:27:40.000000000 +0200
-+++ Firebird-2.1.1.17910-0/src/jrd/svc.cpp 2008-08-23 18:01:19.000000000 +0200
-@@ -2037,7 +2037,7 @@
- #endif
-
- TEXT name[MAXPATHLEN];
-- gds__prefix(name, LOGFILE);
-+ sprintf(name, "/var/log/%s", LOGFILE);
- FILE* file = fopen(name, "r");
- if (file != NULL) {
- #ifdef SERVICE_THREAD
+ virtual ~ConfigRoot() {}
diff -U 3 -H -d -r -N -- Firebird-2.1.1.17910-0~/src/utilities/ibmgr/srvrmgr.cpp Firebird-2.1.1.17910-0/src/utilities/ibmgr/srvrmgr.cpp
--- Firebird-2.1.1.17910-0~/src/utilities/ibmgr/srvrmgr.cpp 2007-03-28 06:20:36.000000000 +0200
+++ Firebird-2.1.1.17910-0/src/utilities/ibmgr/srvrmgr.cpp 2008-08-23 16:16:02.000000000 +0200
projects / packages / Firebird.git / blobdiff