forked from Lainports/freebsd-ports
f83159f188
List of vulnerabilities is documented on: http://vuxml.freebsd.org/freebsd/8c2b2f11-0ebe-11e6-b55e-b499baebfeaf.html CVE IDs see below. PR: 206998 Submitted by: mokhi64@gmail.com (maintainer) Reviewed by: rootservice@gmail.com Approved by: mokhi64@gmail.com (maintainer) MFH: 2016Q2 Security: CVE-2016-0705 CVE-2016-0639 CVE-2015-3194 CVE-2016-0640 CVE-2016-0641 CVE-2016-3461 CVE-2016-2047 CVE-2016-0642 CVE-2016-0643 CVE-2016-0644 CVE-2016-0646 CVE-2016-0647 CVE-2016-0648 CVE-2016-0649 CVE-2016-0650 CVE-2016-0652 CVE-2016-0653 CVE-2016-0654 CVE-2016-0655 CVE-2016-0656 CVE-2016-0657 CVE-2016-0658 CVE-2016-0651 CVE-2016-0659 CVE-2016-0661 CVE-2016-0662 CVE-2016-0663 CVE-2016-0665 CVE-2016-0666 CVE-2016-0667 CVE-2016-0668
30 lines
1.2 KiB
C++
30 lines
1.2 KiB
C++
--- sql/conn_handler/socket_connection.cc.orig 2016-03-28 18:06:12 UTC
|
|
+++ sql/conn_handler/socket_connection.cc
|
|
@@ -939,20 +939,23 @@ Channel_info* Mysqld_socket_listener::li
|
|
signal(SIGCHLD, SIG_DFL);
|
|
request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE,
|
|
mysql_socket_getfd(connect_sock), NULL);
|
|
- fromhost(&req);
|
|
+ void (*my_fromhost) (void *) = (void (*)(void *)) fromhost;
|
|
+ my_fromhost(&req);
|
|
|
|
- if (!hosts_access(&req))
|
|
+ int (*my_hosts_access) (void *) = (int (*) (void *)) hosts_access;
|
|
+ if (!my_hosts_access(&req))
|
|
{
|
|
/*
|
|
This may be stupid but refuse() includes an exit(0)
|
|
which we surely don't want...
|
|
clean_exit() - same stupid thing ...
|
|
*/
|
|
+ char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client;
|
|
syslog(LOG_AUTH | m_deny_severity,
|
|
- "refused connect from %s", eval_client(&req));
|
|
+ "refused connect from %s", my_eval_client(&req));
|
|
|
|
if (req.sink)
|
|
- (req.sink)(req.fd);
|
|
+ ((void (*)(int)) (req.sink))(req.fd);
|
|
|
|
mysql_socket_shutdown(listen_sock, SHUT_RDWR);
|
|
mysql_socket_close(listen_sock);
|