Commit 4237e7ac authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org

Merge sinisa@work.mysql.com:/home/bk/mysql-4.1

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1
parents 035dae3f 24ed42c6
...@@ -2456,6 +2456,7 @@ pthread_handler_decl(handle_connections_sockets,arg __attribute__((unused))) ...@@ -2456,6 +2456,7 @@ pthread_handler_decl(handle_connections_sockets,arg __attribute__((unused)))
struct request_info req; struct request_info req;
signal(SIGCHLD, SIG_DFL); signal(SIGCHLD, SIG_DFL);
request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, new_sock, NULL); request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, new_sock, NULL);
#ifndef __linux__
fromhost(&req); fromhost(&req);
if (!hosts_access(&req)) if (!hosts_access(&req))
{ {
...@@ -2465,6 +2466,12 @@ pthread_handler_decl(handle_connections_sockets,arg __attribute__((unused))) ...@@ -2465,6 +2466,12 @@ pthread_handler_decl(handle_connections_sockets,arg __attribute__((unused)))
clean_exit() - same stupid thing ... clean_exit() - same stupid thing ...
*/ */
syslog(deny_severity, "refused connect from %s", eval_client(&req)); syslog(deny_severity, "refused connect from %s", eval_client(&req));
#else
fromhost();
if (!hosts_access())
{
syslog(deny_severity, "refused connect from %s", eval_client());
#endif
if (req.sink) if (req.sink)
((void (*)(int))req.sink)(req.fd); ((void (*)(int))req.sink)(req.fd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment