1 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
2 --- Firebird-2.1.1.17910-0~/builds/install/misc/createAliasDB.sh.in 2005-08-16 12:03:22.000000000 +0200
3 +++ Firebird-2.1.1.17910-0/builds/install/misc/createAliasDB.sh.in 2008-08-23 15:52:25.000000000 +0200
8 - AliasFile=$FBRootDir/aliases.conf
9 + AliasFile=/etc/firebird/aliases.conf
12 checkNameStartsWithSlash $newDB
13 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
14 --- Firebird-2.1.1.17910-0~/src/jrd/db_alias.cpp 2006-05-19 17:16:45.000000000 +0200
15 +++ Firebird-2.1.1.17910-0/src/jrd/db_alias.cpp 2008-08-23 17:58:51.000000000 +0200
18 bool ResolveDatabaseAlias(const string& alias, string& database)
20 - string alias_filename;
21 - Firebird::Prefix(alias_filename, ALIAS_FILE);
22 + string alias_filename = "/etc/firebird/aliases.conf";
23 ConfigFile aliasConfig(false);
24 aliasConfig.setConfigFilePath(alias_filename);
26 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
27 --- Firebird-2.1.1.17910-0~/src/jrd/gds.cpp 2008-08-23 13:50:58.000000000 +0200
28 +++ Firebird-2.1.1.17910-0/src/jrd/gds.cpp 2008-08-23 18:02:40.000000000 +0200
32 static char fb_prefix_val[MAXPATHLEN];
33 -static char fb_prefix_lock_val[MAXPATHLEN];
34 +static char fb_prefix_lock_val[MAXPATHLEN] = "/var/lib/firebird";
35 static char fb_prefix_msg_val[MAXPATHLEN];
36 static char fbTempDir[MAXPATHLEN];
40 if (trace_file_handle == INVALID_HANDLE_VALUE) {
41 TEXT name[MAXPATHLEN];
42 - gds__prefix(name, LOGFILE);
43 + sprintf(name, "/var/log/%s", LOGFILE);
44 // We do not care to close this file.
45 // It will be closed automatically when our process terminates.
46 trace_file_handle = CreateFile(name, GENERIC_WRITE,
48 TEXT name[MAXPATHLEN];
50 // Note: signal-safe code
51 - gds__prefix(name, LOGFILE);
52 + sprintf(name, "/var/log/%s", LOGFILE);
53 int file = open(name, O_CREAT | O_APPEND | O_WRONLY, 0660);
57 now = time((time_t *)0);
60 - gds__prefix(name, LOGFILE);
61 + sprintf(name, "/var/log/%s", LOGFILE);
64 WaitForSingleObject(trace_mutex_handle, INFINITE);
66 now = time((time_t *)0);
69 - gds__prefix(name, LOGFILE);
70 + sprintf(name, "/var/log/%s", LOGFILE);
72 const int oldmask = umask(0111);
74 diff -U 3 -H -d -r -N -- Firebird-2.1.1.17910-0~/src/jrd/jrd_pwd.h Firebird-2.1.1.17910-0/src/jrd/jrd_pwd.h
75 --- Firebird-2.1.1.17910-0~/src/jrd/jrd_pwd.h 2008-05-27 11:27:34.000000000 +0200
76 +++ Firebird-2.1.1.17910-0/src/jrd/jrd_pwd.h 2008-08-23 17:49:56.000000000 +0200
81 - gds__prefix(path_buffer, USER_INFO_NAME);
82 + sprintf(path_buffer, "/var/lib/firebird/%s", USER_INFO_NAME);
85 static void initialize();
86 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
87 --- Firebird-2.1.1.17910-0~/src/jrd/os/config_root.h 2007-04-05 14:47:15.000000000 +0200
88 +++ Firebird-2.1.1.17910-0/src/jrd/os/config_root.h 2008-08-23 16:09:04.000000000 +0200
92 install_dir = root_dir;
93 - config_file = root_dir + string(CONFIG_FILE);
94 + config_file = "/etc/firebird/" + string(CONFIG_FILE);
98 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
99 --- Firebird-2.1.1.17910-0~/src/jrd/svc.cpp 2008-05-27 11:27:40.000000000 +0200
100 +++ Firebird-2.1.1.17910-0/src/jrd/svc.cpp 2008-08-23 18:01:19.000000000 +0200
101 @@ -2037,7 +2037,7 @@
104 TEXT name[MAXPATHLEN];
105 - gds__prefix(name, LOGFILE);
106 + sprintf(name, "/var/log/%s", LOGFILE);
107 FILE* file = fopen(name, "r");
109 #ifdef SERVICE_THREAD
110 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
111 --- Firebird-2.1.1.17910-0~/src/utilities/ibmgr/srvrmgr.cpp 2007-03-28 06:20:36.000000000 +0200
112 +++ Firebird-2.1.1.17910-0/src/utilities/ibmgr/srvrmgr.cpp 2008-08-23 16:16:02.000000000 +0200
114 rs = "can not quit now, use shut -ign";
117 - rs = "check $FIREBIRD/firebird.log file for errors";
118 + rs = "check /var/log/firebird.log file for errors";
121 rs = "can not start server";