diff options
| author | Sergey Matveychuk <sem@FreeBSD.org> | 2005-10-30 19:07:07 +0000 |
|---|---|---|
| committer | Sergey Matveychuk <sem@FreeBSD.org> | 2005-10-30 19:07:07 +0000 |
| commit | 5721ef1cbd29c1d74bdb89ec4461af5b3afa4631 (patch) | |
| tree | 280c64a139292de80f18c07c3dd2d6b7295166e8 /databases/msql3/files | |
| parent | - Use fetchmailconf-1.43.2 in order to fix a password exposure caused by (diff) | |
* Fix msql.conf location for msql3_broker
* Fix some options in msql.conf
PR: ports/88069
Submitted by: Andrey Slusar (maintainer)
Reported by: Terry Kennedy <terry at tmk.com>
Notes
Notes:
svn path=/head/; revision=146759
Diffstat (limited to 'databases/msql3/files')
| -rw-r--r-- | databases/msql3/files/patch-main_broker.c | 11 | ||||
| -rw-r--r-- | databases/msql3/files/patch-msql.conf | 17 |
2 files changed, 21 insertions, 7 deletions
diff --git a/databases/msql3/files/patch-main_broker.c b/databases/msql3/files/patch-main_broker.c new file mode 100644 index 000000000000..64c96cb110d2 --- /dev/null +++ b/databases/msql3/files/patch-main_broker.c @@ -0,0 +1,11 @@ +--- src/msqld/main/main_broker.c.old Wed Oct 26 22:07:31 2005 ++++ src/msqld/main/main_broker.c Wed Oct 26 22:08:53 2005 +@@ -1391,7 +1391,7 @@ + + if (*confFile == 0) + { +- snprintf(confFile,sizeof(confFile),"%s/msql.conf", INST_DIR); ++ snprintf(confFile,sizeof(confFile),"%s/etc/msql3/msql.conf", INST_DIR); + } + printf("\tLoading configuration from '%s'.\n",confFile); + configLoadFile(confFile); diff --git a/databases/msql3/files/patch-msql.conf b/databases/msql3/files/patch-msql.conf index c6ff1ff27aec..c138320fc45c 100644 --- a/databases/msql3/files/patch-msql.conf +++ b/databases/msql3/files/patch-msql.conf @@ -1,27 +1,30 @@ --- misc/msql.conf.orig Mon Nov 4 01:34:36 2002 -+++ misc/msql.conf Tue May 4 17:34:38 2004 ++++ misc/msql.conf Thu Oct 27 00:23:31 2005 @@ -18,12 +18,12 @@ [general] Inst_Dir = _INST_ -DB_Dir = %I/msqldb +-mSQL_User = daemon +DB_Dir = /var/db/msql3db - mSQL_User = daemon ++mSQL_User = msql Admin_User = root -Pid_File = %I/msql3d.pid -+Pid_File = /var/spool/msql/msql3d.pid ++Pid_File = /var/spool/msql3/msql3d.pid TCP_Port = 1114 -UNIX_Port = %I/msql3.sock -+UNIX_Port = /var/spool/msql/msql3.sock ++UNIX_Port = /var/spool/msql3/msql3.sock [system] -@@ -35,7 +35,7 @@ +@@ -35,8 +35,8 @@ Local_Access = True Force_Munmap = False Query_Log = False -Query_Log_File = %I/query.log -+#Query_Log_File = /var/spool/msql/query.log ++#Query_Log_File = /var/spool/msql3/query.log #Update_Log = False - #Update_Log_File = %I/update.log +-#Update_Log_File = %I/update.log ++#Update_Log_File = /var/spool/msql3/update.log Table_Cache = 8 + Sort_Max_Mem = 1000 |