bk commit into 5.0 tree (jani:1.2194) BUG#18246

[jani]

Below is the list of changes that have just been committed into a local
5.0 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2194 06/06/21 02:23:18 jani@stripped +5 -0
  Fix for Bug#18246 "compilation error with tcp_wrapper"

  sql/mysqld.cc
    1.556 06/06/21 02:23:10 jani@stripped +3 -3
    Fix for Bug#18246 "compilation error with tcp_wrapper"
    
    Added wrapper functions.

  mysys/Makefile.am
    1.70 06/06/21 02:23:10 jani@stripped +1 -1
    Fix for Bug#18246 "compilation error with tcp_wrapper"

  include/Makefile.am
    1.57 06/06/21 02:23:09 jani@stripped +1 -1
    Fix for Bug#18246 "compilation error with tcp_wrapper"

  include/my_libwrap.h
    1.1 06/06/21 02:21:26 jani@stripped +19 -0

  include/my_libwrap.h
    1.0 06/06/21 02:21:26 jani@stripped +0 -0
    BitKeeper file /home/my/bk/mysql-5.0/include/my_libwrap.h

  mysys/my_libwrap.c
    1.1 06/06/21 02:21:20 jani@stripped +39 -0

  mysys/my_libwrap.c
    1.0 06/06/21 02:21:20 jani@stripped +0 -0
    BitKeeper file /home/my/bk/mysql-5.0/mysys/my_libwrap.c

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	ua141d10.elisa.omakaista.fi
# Root:	/home/my/bk/mysql-5.0

--- 1.56/include/Makefile.am	2006-01-11 01:07:34 +02:00
+++ 1.57/include/Makefile.am	2006-06-21 02:23:09 +03:00
@@ -31,7 +31,7 @@
 			my_aes.h my_tree.h hash.h thr_alarm.h \
 			thr_lock.h t_ctype.h violite.h md5.h base64.h \
 			mysql_version.h.in my_handler.h my_time.h decimal.h \
-			my_user.h
+			my_user.h my_libwrap.h
 
 # mysql_version.h are generated
 CLEANFILES =            mysql_version.h my_config.h readline openssl

--- 1.69/mysys/Makefile.am	2006-05-02 05:50:27 +03:00
+++ 1.70/mysys/Makefile.am	2006-06-21 02:23:10 +03:00
@@ -56,7 +56,7 @@
 			my_gethostbyname.c rijndael.c my_aes.c sha1.c \
 			my_handler.c my_netware.c my_largepage.c \
 			my_memmem.c \
-			my_windac.c my_access.c base64.c
+			my_windac.c my_access.c base64.c my_libwrap.c
 EXTRA_DIST =		thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
 			thr_mutex.c thr_rwlock.c
 libmysys_a_LIBADD =	@THREAD_LOBJECTS@

--- 1.555/sql/mysqld.cc	2006-06-19 14:11:17 +03:00
+++ 1.556/sql/mysqld.cc	2006-06-21 02:23:10 +03:00
@@ -4072,8 +4072,8 @@
 	struct request_info req;
 	signal(SIGCHLD, SIG_DFL);
 	request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, new_sock, NULL);
-	fromhost(&req);
-	if (!hosts_access(&req))
+	my_fromhost(&req);
+	if (!my_hosts_access(&req))
 	{
 	  /*
 	    This may be stupid but refuse() includes an exit(0)
@@ -4081,7 +4081,7 @@
 	    clean_exit() - same stupid thing ...
 	  */
 	  syslog(deny_severity, "refused connect from %s",
-		 eval_client(&req));
+		 my_eval_client(&req));
 
 	  /*
 	    C++ sucks (the gibberish in front just translates the supplied
--- New file ---
+++ include/my_libwrap.h	06/06/21 02:21:26
/* Copyright (C) 2000 MySQL AB

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

extern void my_fromhost(struct request_info *req);
extern int my_hosts_access(struct request_info *req);
extern char *my_eval_client(struct request_info *req);

--- New file ---
+++ mysys/my_libwrap.c	06/06/21 02:21:20
/* Copyright (C) 2003 MySQL AB

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

#include <my_global.h>
#ifdef HAVE_LIBWRAP
#include <tcpd.h>
#include <syslog.h>
#ifdef NEED_SYS_SYSLOG_H
#include <sys/syslog.h>
#endif /* NEED_SYS_SYSLOG_H */
#endif

void my_fromhost(struct request_info *req)
{
  fromhost(req);
}

int my_hosts_access(struct request_info *req)
{
  hosts_access(req);
}

char *my_eval_client(struct request_info *req)
{
  eval_client(req);
}