database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Cleanup to patch for Bug#18246, "compilation error with tcp_wrapper"

Browse Source 
include/my_libwrap.h:
  Changed includes to the header file.
mysys/my_libwrap.c:
  Added comment and .c file now takes needed includes from
  the corresponding .h file.
sql/mysqld.cc:
  Include this block from my_libwra.h now.
  Moved two variables out of the otherwise
  same block.
This commit is contained in:
unknown
2006-06-21 18:35:19 +03:00
parent 72cb1d5049
commit e8e52a6a25
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/my_libwrap.h
View File

@ -14,6 +14,15 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef HAVE_LIBWRAP
#include <tcpd.h>
#include <syslog.h>
#ifdef NEED_SYS_SYSLOG_H
#include <sys/syslog.h>
#endif /* NEED_SYS_SYSLOG_H */
extern void my_fromhost(struct request_info *req); extern void my_fromhost(struct request_info *req);
extern int my_hosts_access(struct request_info *req); extern int my_hosts_access(struct request_info *req);
extern char *my_eval_client(struct request_info *req); extern char *my_eval_client(struct request_info *req);
#endif /* HAVE_LIBWRAP */

15
mysys/my_libwrap.c
View File

@ -14,14 +14,15 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/*
This is needed to be able to compile with original libwrap header
files that don't have the prototypes
*/
#include <my_global.h> #include <my_global.h>
#include <my_libwrap.h>
#ifdef HAVE_LIBWRAP #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) void my_fromhost(struct request_info *req)
{ {
@ -37,3 +38,5 @@ char *my_eval_client(struct request_info *req)
{ {
eval_client(req); eval_client(req);
} }
#endif /* HAVE_LIBWRAP */

13
sql/mysqld.cc
View File

@ -120,16 +120,7 @@ extern "C" { // Because of SCO 3.2V4.2
#include <sys/utsname.h> #include <sys/utsname.h>
#endif /* __WIN__ */ #endif /* __WIN__ */
#ifdef HAVE_LIBWRAP #include <my_libwrap.h>
#include <tcpd.h>
#include <syslog.h>
#ifdef NEED_SYS_SYSLOG_H
#include <sys/syslog.h>
#endif /* NEED_SYS_SYSLOG_H */
int allow_severity = LOG_INFO;
int deny_severity = LOG_WARNING;
#endif /* HAVE_LIBWRAP */
#ifdef HAVE_SYS_MMAN_H #ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h> #include <sys/mman.h>
@ -591,6 +582,8 @@ static const char* default_dbug_option;
#endif #endif
#ifdef HAVE_LIBWRAP #ifdef HAVE_LIBWRAP
const char *libwrapName= NULL; const char *libwrapName= NULL;
int allow_severity = LOG_INFO;
int deny_severity = LOG_WARNING;
#endif #endif
#ifdef HAVE_QUERY_CACHE #ifdef HAVE_QUERY_CACHE
static ulong query_cache_limit= 0; static ulong query_cache_limit= 0;