Commit 7ab0561f authored by unknown's avatar unknown
Browse files

merge

parents 2d9eeb04 50bd606d

sql/mysqld.cc

+3 −12
Original line number Diff line number Diff line
@@ -141,15 +141,6 @@ extern "C" { // Because of SCO 3.2V4.2 
int allow_severity = LOG_INFO;

int deny_severity = LOG_WARNING;



#ifdef __STDC__

#define my_fromhost(A)	   fromhost(A)

#define my_hosts_access(A) hosts_access(A)

#define my_eval_client(A)  eval_client(A)

#else

#define my_fromhost(A)	   fromhost()

#define my_hosts_access(A) hosts_access()

#define my_eval_client(A)  eval_client()

#endif /* __STDC__ */

#endif /* HAVE_LIBWRAP */



#ifdef HAVE_SYS_MMAN_H
@@ -3574,8 +3565,8 @@ extern "C" pthread_handler_decl(handle_connections_sockets, 
	struct request_info req;

	signal(SIGCHLD, SIG_DFL);

	request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, new_sock, NULL);

	my_fromhost(&req);

	if (!my_hosts_access(&req))

	fromhost(&req);

	if (!hosts_access(&req))

	{

	  /*

	    This may be stupid but refuse() includes an exit(0)
@@ -3583,7 +3574,7 @@ extern "C" pthread_handler_decl(handle_connections_sockets, 
	    clean_exit() - same stupid thing ...

	  */

	  syslog(deny_severity, "refused connect from %s",

		 my_eval_client(&req));

		 eval_client(&req));



	  /*

	    C++ sucks (the gibberish in front just translates the supplied