diff options
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/mysqld.cc | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index bd35c33892e..ebbe3a30696 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -16,3 +16,4 @@ jani@hynda.mysql.fi miguel@hegel.local arjen@fred.bitbike.com sinisa@rhols221.adsl.netsonic.fi +Sinisa@sinisa.nasamreza.org diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 1d108b3f4c2..fa5f6ae395e 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2415,6 +2415,7 @@ pthread_handler_decl(handle_connections_sockets,arg __attribute__((unused))) struct request_info req; signal(SIGCHLD, SIG_DFL); request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, new_sock, NULL); +#ifndef __linux__ fromhost(&req); if (!hosts_access(&req)) { @@ -2422,6 +2423,12 @@ pthread_handler_decl(handle_connections_sockets,arg __attribute__((unused))) // which we surely don't want... // clean_exit() - same stupid thing ... 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) ((void (*)(int))req.sink)(req.fd); |