]>
Commit | Line | Data |
---|---|---|
c8a07220 KK |
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 | |
4 | @@ -125,7 +125,7 @@ | |
5 | aliasName=$1 | |
6 | newDB=$2 | |
7 | ||
8 | - AliasFile=$FBRootDir/aliases.conf | |
9 | + AliasFile=/etc/firebird/aliases.conf | |
10 | ||
11 | ||
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 | |
16 | @@ -45,8 +45,7 @@ | |
17 | ||
18 | bool ResolveDatabaseAlias(const string& alias, string& database) | |
19 | { | |
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); | |
25 | ||
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 | |
c8a07220 KK |
29 | @@ -1090,7 +1090,7 @@ |
30 | while (true) { | |
31 | if (trace_file_handle == INVALID_HANDLE_VALUE) { | |
32 | TEXT name[MAXPATHLEN]; | |
33 | - gds__prefix(name, LOGFILE); | |
34 | + sprintf(name, "/var/log/%s", LOGFILE); | |
35 | // We do not care to close this file. | |
36 | // It will be closed automatically when our process terminates. | |
37 | trace_file_handle = CreateFile(name, GENERIC_WRITE, | |
38 | @@ -1116,7 +1116,7 @@ | |
39 | TEXT name[MAXPATHLEN]; | |
40 | ||
41 | // Note: signal-safe code | |
42 | - gds__prefix(name, LOGFILE); | |
43 | + sprintf(name, "/var/log/%s", LOGFILE); | |
44 | int file = open(name, O_CREAT | O_APPEND | O_WRONLY, 0660); | |
45 | if (file == -1) | |
46 | return; | |
47 | @@ -1227,7 +1227,7 @@ | |
48 | now = time((time_t *)0); | |
49 | #endif | |
50 | ||
51 | - gds__prefix(name, LOGFILE); | |
52 | + sprintf(name, "/var/log/%s", LOGFILE); | |
53 | ||
54 | #ifdef WIN_NT | |
55 | WaitForSingleObject(trace_mutex_handle, INFINITE); | |
56 | @@ -1283,7 +1283,7 @@ | |
57 | now = time((time_t *)0); | |
58 | #endif | |
59 | ||
60 | - gds__prefix(name, LOGFILE); | |
61 | + sprintf(name, "/var/log/%s", LOGFILE); | |
62 | ||
63 | const int oldmask = umask(0111); | |
64 | #ifdef WIN_NT | |
668b2a73 KK |
65 | @@ -1844,8 +1844,13 @@ |
66 | fb_utils::snprintf(buf, MAXPATHLEN, root, fbEmbeddedRoot); | |
67 | root = buf; | |
68 | #endif | |
69 | + const char *lockdir = "/var/lib/firebird"; | |
70 | + struct stat sb; | |
71 | + if (stat(lockdir, &sb) == 0 && (sb.st_mode & S_IFMT) == S_IFDIR) | |
72 | + strcpy(string, lockdir); | |
73 | + else | |
74 | + strcpy(string, fb_prefix_lock); // safe - no BO | |
75 | ||
76 | - strcpy(string, fb_prefix_lock); // safe - no BO | |
77 | safe_concat_path(string, root); | |
78 | } | |
79 | #endif | |
80 | --- Firebird-2.1.3.18185-0/src/jrd/jrd_pwd.h.orig 2008-04-03 19:00:51.000000000 +0200 | |
81 | +++ Firebird-2.1.3.18185-0/src/jrd/jrd_pwd.h 2009-09-19 05:52:40.000000000 +0200 | |
c8a07220 KK |
82 | @@ -60,7 +60,7 @@ |
83 | "security2.fdb"; | |
84 | #endif | |
85 | ||
86 | - gds__prefix(path_buffer, USER_INFO_NAME); | |
668b2a73 | 87 | + gds__prefix_lock(path_buffer, USER_INFO_NAME); |
c8a07220 KK |
88 | } |
89 | ||
90 | static void initialize(); | |
91 | 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 | |
92 | --- Firebird-2.1.1.17910-0~/src/jrd/os/config_root.h 2007-04-05 14:47:15.000000000 +0200 | |
93 | +++ Firebird-2.1.1.17910-0/src/jrd/os/config_root.h 2008-08-23 16:09:04.000000000 +0200 | |
94 | @@ -83,7 +83,7 @@ | |
95 | { | |
96 | GetRoot(); | |
97 | install_dir = root_dir; | |
98 | - config_file = root_dir + string(CONFIG_FILE); | |
99 | + config_file = "/etc/firebird/" + string(CONFIG_FILE); | |
100 | } | |
101 | ||
102 | ||
103 | 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 | |
104 | --- Firebird-2.1.1.17910-0~/src/jrd/svc.cpp 2008-05-27 11:27:40.000000000 +0200 | |
105 | +++ Firebird-2.1.1.17910-0/src/jrd/svc.cpp 2008-08-23 18:01:19.000000000 +0200 | |
106 | @@ -2037,7 +2037,7 @@ | |
107 | #endif | |
108 | ||
109 | TEXT name[MAXPATHLEN]; | |
110 | - gds__prefix(name, LOGFILE); | |
111 | + sprintf(name, "/var/log/%s", LOGFILE); | |
112 | FILE* file = fopen(name, "r"); | |
113 | if (file != NULL) { | |
114 | #ifdef SERVICE_THREAD | |
115 | 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 | |
116 | --- Firebird-2.1.1.17910-0~/src/utilities/ibmgr/srvrmgr.cpp 2007-03-28 06:20:36.000000000 +0200 | |
117 | +++ Firebird-2.1.1.17910-0/src/utilities/ibmgr/srvrmgr.cpp 2008-08-23 16:16:02.000000000 +0200 | |
118 | @@ -272,7 +272,7 @@ | |
119 | rs = "can not quit now, use shut -ign"; | |
120 | break; | |
121 | case MSG_STARTERR: | |
122 | - rs = "check $FIREBIRD/firebird.log file for errors"; | |
123 | + rs = "check /var/log/firebird.log file for errors"; | |
124 | break; | |
125 | case MSG_STARTFAIL: | |
126 | rs = "can not start server"; |