1 files changed, 27 insertions, 26 deletions
diff --git a/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc b/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc
index dfc5b394e9c7..36b445f4351e 100644
--- a/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc
+++ b/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc
@@ -1,31 +1,32 @@
---- sql/conn_handler/socket_connection.cc.orig	2018-04-08 06:44:49 UTC
+--- sql/conn_handler/socket_connection.cc.orig	2019-01-21 20:10:03 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);
+@@ -873,9 +873,11 @@ bool check_connection_refused_by_tcp_wra
+   signal(SIGCHLD, SIG_DFL);
+   request_init(&req, RQ_DAEMON, 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));
+-  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...
+@@ -887,12 +889,13 @@ bool check_connection_refused_by_tcp_wra
+       This is unproblematic as TCP-wrapper is unix specific,
+       anyway.
+     */
++    char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client;
+     syslog(LOG_AUTH | LOG_WARNING, "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);
-+
+     // 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);
+     // Some distros have not patched tcpd.h
+     if (req.sink) ((void (*)(int))req.sink)(req.fd);