diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2005-03-14 10:52:45 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2005-03-14 10:52:45 +0000 |
| commit | 6b308dae47547be9a0721fa81a74524c4faf9d61 (patch) | |
| tree | 4438382802aa17b2f9cccf7101082b10f4c54e0f /databases/mysql40-server/files/patch-sql::mysqld.cc | |
| parent | - Fix missing 'use jffnms;' in ${FILESDIR}/jffnms_db.sh. (diff) | |
Update to 4.0.24 release:
- Fix potential security vulnerabilities in the creation of temporary
table file names and the handling of User Defined Functions (UDFs)
- Add the possibility to specify the database directory in rc.conf
- Move database creation from post-install stage into startup script
Notes
Notes:
svn path=/head/; revision=131178
Diffstat (limited to 'databases/mysql40-server/files/patch-sql::mysqld.cc')
| -rw-r--r-- | databases/mysql40-server/files/patch-sql::mysqld.cc | 42 |
1 files changed, 3 insertions, 39 deletions
diff --git a/databases/mysql40-server/files/patch-sql::mysqld.cc b/databases/mysql40-server/files/patch-sql::mysqld.cc index 8b6159b9c32b..e79f985fcb69 100644 --- a/databases/mysql40-server/files/patch-sql::mysqld.cc +++ b/databases/mysql40-server/files/patch-sql::mysqld.cc @@ -1,6 +1,6 @@ ---- sql/mysqld.cc.orig Sat Dec 18 18:25:05 2004 -+++ sql/mysqld.cc Sun Jan 9 12:43:21 2005 -@@ -99,7 +99,7 @@ +--- sql/mysqld.cc.orig Tue Dec 14 13:40:36 2004 ++++ sql/mysqld.cc Mon Jan 10 00:28:52 2005 +@@ -128,7 +128,7 @@ #endif /* __WIN__ */ #ifdef HAVE_LIBWRAP @@ -9,39 +9,3 @@ #include <syslog.h> #ifdef NEED_SYS_SYSLOG_H #include <sys/syslog.h> -@@ -107,15 +107,6 @@ - int allow_severity = LOG_INFO; - int deny_severity = LOG_WARNING; - --#ifdef __STDC__ --#define my_fromhost(A) fromhost(A) --#define my_hosts_access(A) hosts_access(A) --#define my_eval_client(A) eval_client(A) --#else --#define my_fromhost(A) fromhost() --#define my_hosts_access(A) hosts_access() --#define my_eval_client(A) eval_client() --#endif - #endif /* HAVE_LIBWRAP */ - - #ifdef HAVE_SYS_MMAN_H -@@ -3240,8 +3231,8 @@ - struct request_info req; - signal(SIGCHLD, SIG_DFL); - request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, new_sock, NULL); -- my_fromhost(&req); -- if (!my_hosts_access(&req)) -+ fromhost(&req); -+ if (!hosts_access(&req)) - { - /* - This may be stupid but refuse() includes an exit(0) -@@ -3249,7 +3240,7 @@ - clean_exit() - same stupid thing ... - */ - syslog(deny_severity, "refused connect from %s", -- my_eval_client(&req)); -+ eval_client(&req)); - - /* - C++ sucks (the gibberish in front just translates the supplied |