forked from Lainports/opnsense-ports
31 lines
1.2 KiB
C++
31 lines
1.2 KiB
C++
--- sql/conn_handler/socket_connection.cc.orig 2018-04-08 06:44:49 UTC
|
|
+++ sql/conn_handler/socket_connection.cc
|
|
@@ -810,20 +810,24 @@ 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));
|
|
+ my_eval_client(&req));
|
|
|
|
#ifdef HAVE_LIBWRAP_PROTOTYPES
|
|
// Some distros have patched tcpd.h to have proper prototypes
|
|
- if (req.sink) (req.sink)(req.fd);
|
|
+ if (req.sink) ((void (*)(int)) (req.sink))(req.fd);
|
|
+
|
|
#else
|
|
// Some distros have not patched tcpd.h
|
|
if (req.sink) ((void (*)(int))req.sink)(req.fd);
|