1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
|
diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird Firebird-2.1.0.16780-Beta2/builds/posix/Makefile.in.firebird
--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird 2007-10-19 11:11:36.000000000 -0400
+++ Firebird-2.1.0.16780-Beta2/builds/posix/Makefile.in.firebird 2007-10-19 11:20:01.000000000 -0400
@@ -185,14 +185,14 @@
#
external_libraries:
-ifeq ($(STD_ICU),false)
- $(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
-endif
-ifeq ($(STD_EDITLINE),false)
-ifeq ($(EDITLINE_FLG),Y)
- $(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
-endif
-endif
+#ifeq ($(STD_ICU),false)
+# $(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
+#endif
+#ifeq ($(STD_EDITLINE),false)
+#ifeq ($(EDITLINE_FLG),Y)
+# $(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
+#endif
+#endif
btyacc_binary: $(BTYACC)
diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.defaults Firebird-2.1.0.16780-Beta2/builds/posix/make.defaults
--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.defaults 2007-10-19 11:11:36.000000000 -0400
+++ Firebird-2.1.0.16780-Beta2/builds/posix/make.defaults 2007-10-19 12:31:50.000000000 -0400
@@ -229,11 +229,11 @@
LIBFBSTATIC_A = $(LIB)/libfbstatic.a
ifeq ($(EDITLINE_FLG),Y)
- ifeq ($(STD_EDITLINE), true)
- LIBEDITLINE := -leditline
- else
- LIBEDITLINE := $(LIB)/libeditline.a
- endif
+# ifeq ($(STD_EDITLINE), true)
+ LIBEDITLINE := -ledit
+# else
+# LIBEDITLINE := $(LIB)/libeditline.a
+# endif
endif
LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \
diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.rules Firebird-2.1.0.16780-Beta2/builds/posix/make.rules
--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.rules 2007-10-19 11:11:36.000000000 -0400
+++ Firebird-2.1.0.16780-Beta2/builds/posix/make.rules 2007-10-19 11:30:08.000000000 -0400
@@ -33,9 +33,9 @@
# Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan
-ifeq ($(STD_ICU),false)
- CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
-endif
+#ifeq ($(STD_ICU),false)
+# CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
+#endif
ifeq ($(IsProdTypeBuild),Y)
CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD
@@ -69,19 +69,19 @@
.SUFFIXES: .c .e .epp .cpp
-.e.c:
+.e.c: $(GPRE_CURRENT)
$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
-.epp.cpp:
+.epp.cpp: $(GPRE_CURRENT)
$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
-$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp
+$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp $(GPRE_CURRENT)
$(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@
-$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp
+$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp $(GPRE_CURRENT)
$(GPRE_CURRENT) $(DSQL_GPRE_FLAGS) $< $@
diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets Firebird-2.1.0.16780-Beta2/builds/posix/make.shared.targets
--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets 2007-10-19 11:11:36.000000000 -0400
+++ Firebird-2.1.0.16780-Beta2/builds/posix/make.shared.targets 2007-10-19 11:28:58.000000000 -0400
@@ -49,7 +49,7 @@
# gpre_meta needs a special boot build since there is no database.
-$(SRC_ROOT)/gpre/gpre_meta.cpp: $(SRC_ROOT)/gpre/gpre_meta.epp
+$(SRC_ROOT)/gpre/gpre_meta.cpp: $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT)
$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/prefix.linux Firebird-2.1.0.16780-Beta2/builds/posix/prefix.linux
--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/prefix.linux 2007-10-19 11:11:36.000000000 -0400
+++ Firebird-2.1.0.16780-Beta2/builds/posix/prefix.linux 2007-11-05 21:31:20.000000000 -0500
@@ -21,11 +21,10 @@
# -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion
# you may remove it if engine is getting compiled with any other GCC version
-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
-OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin
+COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC
WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
+PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS)
DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
#DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
diff -Naur Firebird-2.1.0.16780-Beta2_orig/configure Firebird-2.1.0.16780-Beta2/configure
--- Firebird-2.1.0.16780-Beta2_orig/configure 2007-10-19 11:11:39.000000000 -0400
+++ Firebird-2.1.0.16780-Beta2/configure 2007-10-19 11:26:19.000000000 -0400
@@ -3928,13 +3928,13 @@
# not need editline in default libs, but need to test for its presence
saveLIBS=$LIBS
if test "$STD_EDITLINE" = "true"; then
- { echo "$as_me:$LINENO: checking for readline in -leditline" >&5
-echo $ECHO_N "checking for readline in -leditline... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for readline in -ledit" >&5
+echo $ECHO_N "checking for readline in -ledit... $ECHO_C" >&6; }
if test "${ac_cv_lib_editline_readline+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-leditline $LIBS"
+LIBS="-ledit $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/db_alias.cpp Firebird-2.1.0.16780-Beta2/src/jrd/db_alias.cpp
--- Firebird-2.1.0.16780-Beta2_orig/src/jrd/db_alias.cpp 2007-10-19 11:11:39.000000000 -0400
+++ Firebird-2.1.0.16780-Beta2/src/jrd/db_alias.cpp 2007-10-19 11:31:25.000000000 -0400
@@ -28,7 +28,7 @@
typedef Firebird::PathName string;
-const char* ALIAS_FILE = "aliases.conf";
+const char* ALIAS_FILE = "../../../etc/firebird/aliases.conf";
static void replace_dir_sep(string& s)
{
diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/file_params.h Firebird-2.1.0.16780-Beta2/src/jrd/file_params.h
--- Firebird-2.1.0.16780-Beta2_orig/src/jrd/file_params.h 2007-10-19 11:11:39.000000000 -0400
+++ Firebird-2.1.0.16780-Beta2/src/jrd/file_params.h 2007-10-19 11:35:32.000000000 -0400
@@ -38,11 +38,11 @@
const int EVENT_SEMAPHORES = 1;
#ifdef NOHOSTNAME
-static const char* EVENT_FILE = "isc_event1";
-static const char* LOCK_FILE = "isc_lock1.gbl";
-static const char* INIT_FILE = "isc_init1";
-static const char* GUARD_FILE = "isc_guard1";
-static const char* MONITOR_FILE = "isc_monitor1";
+static const char* EVENT_FILE = "../../../var/run/firebird/isc_event1";
+static const char* LOCK_FILE = "../../../var/run/firebird/isc_lock1.gbl";
+static const char* INIT_FILE = "../../../var/run/firebird/isc_init1";
+static const char* GUARD_FILE = "../../../var/run/firebird/isc_guard1";
+static const char* MONITOR_FILE = "../../../var/run/firebird/isc_monitor1";
#elif defined(VMS)
static const char* EVENT_FILE = "[000000]isc_event1.%s";
static const char* LOCK_FILE = "[000000]isc_lock1.%s";
@@ -56,11 +56,11 @@
static const char* GUARD_FILE = "%s.grd";
static const char* MONITOR_FILE = "%s.mon";
#else
-static const char* EVENT_FILE = "isc_event1.%s";
-static const char* LOCK_FILE = "isc_lock1.%s";
-static const char* INIT_FILE = "isc_init1.%s";
-static const char* GUARD_FILE = "isc_guard1.%s";
-static const char* MONITOR_FILE = "isc_monitor1.%s";
+static const char* EVENT_FILE = "../../../var/run/firebird/isc_event1.%s";
+static const char* LOCK_FILE = "../../../var/run/firebird/isc_lock1.%s";
+static const char* INIT_FILE = "../../../var/run/firebird/isc_init1.%s";
+static const char* GUARD_FILE = "../../../var/run/firebird/isc_guard1.%s";
+static const char* MONITOR_FILE = "../../../var/run/firebird/isc_monitor1.%s";
#endif
#ifdef sun
@@ -91,7 +91,7 @@
static const char* MSG_FILE = "firebird.msg";
static const char MSG_FILE_LANG[]= "intl/%.10s.msg";
const int LOCALE_MAX = 10;
-static const char* LOGFILE = "firebird.log";
+static const char* LOGFILE = "../../../var/log/firebird/firebird.log";
#elif defined(WIN_NT)
static const char* WORKFILE = "c:\\temp\\";
static const char* MSG_FILE = "firebird.msg";
@@ -130,7 +130,7 @@
static const char* MSG_FILE = "firebird.msg";
static const char MSG_FILE_LANG[]= "intl/%.10s.msg";
const int LOCALE_MAX = 10;
-static const char* LOGFILE = "firebird.log";
+static const char* LOGFILE = "../../../var/log/firebird/firebird.log";
#endif
#endif /* JRD_FILE_PARAMS_H */
diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/jrd_pwd.h Firebird-2.1.0.16780-Beta2/src/jrd/jrd_pwd.h
--- Firebird-2.1.0.16780-Beta2_orig/src/jrd/jrd_pwd.h 2007-10-19 11:11:39.000000000 -0400
+++ Firebird-2.1.0.16780-Beta2/src/jrd/jrd_pwd.h 2007-10-19 11:36:14.000000000 -0400
@@ -57,7 +57,7 @@
#ifdef VMS
"[sysmgr]security2.fdb";
#else
- "security2.fdb";
+ "../../../etc/firebird/security2.fdb";
#endif
gds__prefix(path_buffer, USER_INFO_NAME);
diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/os/config_root.h Firebird-2.1.0.16780-Beta2/src/jrd/os/config_root.h
--- Firebird-2.1.0.16780-Beta2_orig/src/jrd/os/config_root.h 2007-10-19 11:11:39.000000000 -0400
+++ Firebird-2.1.0.16780-Beta2/src/jrd/os/config_root.h 2007-10-19 11:37:36.000000000 -0400
@@ -33,7 +33,7 @@
#include "../jrd/os/path_utils.h"
#include "../common/utils_proto.h"
-static const char* CONFIG_FILE = "firebird.conf";
+static const char* CONFIG_FILE = "../../../etc/firebird/firebird.conf";
/**
Since the original (isc.cpp) code wasn't able to provide powerful and
diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/svc.cpp Firebird-2.1.0.16780-Beta2/src/jrd/svc.cpp
--- Firebird-2.1.0.16780-Beta2_orig/src/jrd/svc.cpp 2007-10-19 11:11:39.000000000 -0400
+++ Firebird-2.1.0.16780-Beta2/src/jrd/svc.cpp 2007-10-19 11:44:43.000000000 -0400
@@ -445,38 +445,38 @@
static serv_entry services[] =
{
- { isc_action_max, "print_cache", "-svc", "bin/fb_cache_print", NULL, 0 },
- { isc_action_max, "print_locks", "-svc", "bin/fb_lock_print", NULL, 0 },
- { isc_action_max, "start_cache", "-svc", "bin/fb_cache_manager", NULL, 0 },
- { isc_action_max, "analyze_database", "-svc", "bin/gstat", NULL, 0 },
- { isc_action_max, "backup", "-svc -b", "bin/gbak", MAIN_GBAK, 0 },
- { isc_action_max, "create", "-svc -c", "bin/gbak", MAIN_GBAK, 0 },
- { isc_action_max, "restore", "-svc -r", "bin/gbak", MAIN_GBAK, 0 },
- { isc_action_max, "gdef", "-svc", "bin/gdef", NULL, 0 },
- { isc_action_max, "gsec", "-svc", "bin/gsec", NULL, 0 },
- { isc_action_max, "disable_journal", "-svc -disable", "bin/gjrn", NULL, 0 },
- { isc_action_max, "dump_journal", "-svc -online_dump", "bin/gjrn", NULL, 0 },
- { isc_action_max, "enable_journal", "-svc -enable", "bin/gjrn", NULL, 0 },
- { isc_action_max, "monitor_journal", "-svc -console", "bin/gjrn", NULL, 0 },
+ { isc_action_max, "print_cache", "-svc", "../../../usr/bin/fb_cache_print", NULL, 0 },
+ { isc_action_max, "print_locks", "-svc", "../../../usr/bin/fb_lock_print", NULL, 0 },
+ { isc_action_max, "start_cache", "-svc", "../../../usr/bin/fb_cache_manager", NULL, 0 },
+ { isc_action_max, "analyze_database", "-svc", "../../../usr/bin/gstat", NULL, 0 },
+ { isc_action_max, "backup", "-svc -b", "../../../usr/bin/gbak", MAIN_GBAK, 0 },
+ { isc_action_max, "create", "-svc -c", "../../../usr/bin/gbak", MAIN_GBAK, 0 },
+ { isc_action_max, "restore", "-svc -r", "../../../usr/bin/gbak", MAIN_GBAK, 0 },
+ { isc_action_max, "gdef", "-svc", "../../../usr/bin/gdef", NULL, 0 },
+ { isc_action_max, "gsec", "-svc", "../../../usr/bin/gsec", NULL, 0 },
+ { isc_action_max, "disable_journal", "-svc -disable", "../../../usr/bin/gjrn", NULL, 0 },
+ { isc_action_max, "dump_journal", "-svc -online_dump", "../../../usr/bin/gjrn", NULL, 0 },
+ { isc_action_max, "enable_journal", "-svc -enable", "../../../usr/bin/gjrn", NULL, 0 },
+ { isc_action_max, "monitor_journal", "-svc -console", "../../../usr/bin/gjrn", NULL, 0 },
{ isc_action_max, "query_server", NULL, NULL, NULL, 0 },
- { isc_action_max, "start_journal", "-svc -server", "bin/gjrn", NULL, 0 },
- { isc_action_max, "stop_cache", "-svc -shut -cache", "bin/gfix", NULL, 0 },
- { isc_action_max, "stop_journal", "-svc -console", "bin/gjrn", NULL, 0 },
+ { isc_action_max, "start_journal", "-svc -server", "../../../usr/bin/gjrn", NULL, 0 },
+ { isc_action_max, "stop_cache", "-svc -shut -cache", "../../../usr/bin/gfix", NULL, 0 },
+ { isc_action_max, "stop_journal", "-svc -console", "../../../usr/bin/gjrn", NULL, 0 },
{ isc_action_max, "anonymous", NULL, NULL, NULL, 0 },
/* NEW VERSION 2 calls, the name field MUST be different from those names above
*/
{ isc_action_max, "service_mgr", NULL, NULL, NULL, 0 },
- { isc_action_svc_backup, "Backup Database", NULL, "bin/gbak", MAIN_GBAK, 0 },
- { isc_action_svc_restore, "Restore Database", NULL, "bin/gbak", MAIN_GBAK, 0 },
- { isc_action_svc_repair, "Repair Database", NULL, "bin/gfix", MAIN_GFIX, 0 },
- { isc_action_svc_add_user, "Add User", NULL, "bin/gsec", MAIN_GSEC, 0 },
- { isc_action_svc_delete_user, "Delete User", NULL, "bin/gsec", MAIN_GSEC, 0 },
- { isc_action_svc_modify_user, "Modify User", NULL, "bin/gsec", MAIN_GSEC, 0 },
- { isc_action_svc_display_user, "Display User", NULL, "bin/gsec", MAIN_GSEC, 0 },
- { isc_action_svc_properties, "Database Properties", NULL, "bin/gfix", MAIN_GFIX, 0 },
- { isc_action_svc_lock_stats, "Lock Stats", NULL, "bin/fb_lock_print", TEST_THREAD, 0 },
- { isc_action_svc_db_stats, "Database Stats", NULL, "bin/gstat", MAIN_GSTAT, 0 },
+ { isc_action_svc_backup, "Backup Database", NULL, "../../../usr/bin/gbak", MAIN_GBAK, 0 },
+ { isc_action_svc_restore, "Restore Database", NULL, "../../../usr/bin/gbak", MAIN_GBAK, 0 },
+ { isc_action_svc_repair, "Repair Database", NULL, "../../../usr/bin/gfix", MAIN_GFIX, 0 },
+ { isc_action_svc_add_user, "Add User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 },
+ { isc_action_svc_delete_user, "Delete User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 },
+ { isc_action_svc_modify_user, "Modify User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 },
+ { isc_action_svc_display_user, "Display User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 },
+ { isc_action_svc_properties, "Database Properties", NULL, "../../../usr/bin/gfix", MAIN_GFIX, 0 },
+ { isc_action_svc_lock_stats, "Lock Stats", NULL, "../../../usr/bin/fb_lock_print", TEST_THREAD, 0 },
+ { isc_action_svc_db_stats, "Database Stats", NULL, "../../../usr/bin/gstat", MAIN_GSTAT, 0 },
{ isc_action_svc_get_fb_log, "Get Log File", NULL, NULL, SVC_read_fb_log, 0 },
/* actions with no names are undocumented */
{ isc_action_svc_set_config, NULL, NULL, NULL, TEST_THREAD, 0 },
diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/fbcpl/fbdialog.cpp Firebird-2.1.0.16780-Beta2/src/utilities/fbcpl/fbdialog.cpp
--- Firebird-2.1.0.16780-Beta2_orig/src/utilities/fbcpl/fbdialog.cpp 2007-10-19 11:11:39.000000000 -0400
+++ Firebird-2.1.0.16780-Beta2/src/utilities/fbcpl/fbdialog.cpp 2007-10-19 11:51:22.000000000 -0400
@@ -1367,7 +1367,7 @@
bool CFBDialog::UpdateFirebirdConf(CString option, CString value)
{
CStdioFile FbConfFile, FbConfFileNew;
- CString FirebirdConfFilename = m_Root_Path + "firebird.conf";
+ CString FirebirdConfFilename = "../../../etc/firebird/firebird.conf";
CString FirebirdConfNewname = FirebirdConfFilename + ".new";
CString FirebirdConfOldname = FirebirdConfFilename + ".old";
CString FirebirdConfLine = "";
diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/gsec/security.epp Firebird-2.1.0.16780-Beta2/src/utilities/gsec/security.epp
--- Firebird-2.1.0.16780-Beta2_orig/src/utilities/gsec/security.epp 2007-10-19 11:11:39.000000000 -0400
+++ Firebird-2.1.0.16780-Beta2/src/utilities/gsec/security.epp 2007-10-19 11:51:56.000000000 -0400
@@ -41,7 +41,7 @@
#endif
#include "../common/utils_proto.h"
-DATABASE DB = STATIC FILENAME "security2.fdb";
+DATABASE DB = STATIC FILENAME "../../../etc/firebird/security2.fdb";
static const char* SYSDBA_USER_NAME = "SYSDBA";
diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/guard/guard.cpp Firebird-2.1.0.16780-Beta2/src/utilities/guard/guard.cpp
--- Firebird-2.1.0.16780-Beta2_orig/src/utilities/guard/guard.cpp 2007-10-19 11:11:39.000000000 -0400
+++ Firebird-2.1.0.16780-Beta2/src/utilities/guard/guard.cpp 2007-10-19 11:52:29.000000000 -0400
@@ -59,7 +59,7 @@
const USHORT IGNORE = 3;
const USHORT NORMAL_EXIT= 0;
-const char* SUPER_SERVER_BINARY = "bin/fbserver";
+const char* SUPER_SERVER_BINARY = "../../../usr/bin/fbserver";
const char* INTERBASE_USER = "interbase";
const char* FIREBIRD_USER = "firebird";
diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/ibmgr/ibmgr.h Firebird-2.1.0.16780-Beta2/src/utilities/ibmgr/ibmgr.h
--- Firebird-2.1.0.16780-Beta2_orig/src/utilities/ibmgr/ibmgr.h 2007-10-19 11:11:39.000000000 -0400
+++ Firebird-2.1.0.16780-Beta2/src/utilities/ibmgr/ibmgr.h 2007-10-19 11:52:56.000000000 -0400
@@ -31,7 +31,7 @@
static const char* FIREBIRD_USER_NAME = "firebird";
static const char* INTERBASE_USER_NAME = "interbase";
static const char* INTERBASE_USER_SHORT= "interbas";
-static const char* SERVER_GUARDIAN = "bin/fbguard";
+static const char* SERVER_GUARDIAN = "../../../usr/bin/fbguard";
const USHORT MSG_FAC = 18;
const int MSG_LEN = 128;
diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/ibmgr/srvrmgr.cpp Firebird-2.1.0.16780-Beta2/src/utilities/ibmgr/srvrmgr.cpp
--- Firebird-2.1.0.16780-Beta2_orig/src/utilities/ibmgr/srvrmgr.cpp 2007-10-19 11:11:39.000000000 -0400
+++ Firebird-2.1.0.16780-Beta2/src/utilities/ibmgr/srvrmgr.cpp 2007-10-19 11:53:32.000000000 -0400
@@ -272,7 +272,7 @@
rs = "can not quit now, use shut -ign";
break;
case MSG_STARTERR:
- rs = "check $FIREBIRD/firebird.log file for errors";
+ rs = "check /var/log/firebird/firebird.log file for errors";
break;
case MSG_STARTFAIL:
rs = "can not start server";
|
GitWeb