summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2002-04-13 13:44:08 +0300
committerunknown <Sinisa@sinisa.nasamreza.org>2002-04-13 13:44:08 +0300
commitca1b6de3c9406096f6b64e819e4ac71375272c8e (patch)
tree9440a13d8381af13a44bee834a3612e7a2d7ec5f
parenta14eb12907dd52ad1f9e2a6d0c61747b53f4811f (diff)
downloadmariadb-git-ca1b6de3c9406096f6b64e819e4ac71375272c8e.tar.gz
libwrap bug fix for Linux only
BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--sql/mysqld.cc7
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);