projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes to NEWS
[yaz-moved-to-github.git]
/
src
/
tcpdchk.c
diff --git
a/src/tcpdchk.c
b/src/tcpdchk.c
index
d19f8f6
..
91eb0bc
100644
(file)
--- a/
src/tcpdchk.c
+++ b/
src/tcpdchk.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2011 Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-7,27
+7,38
@@
* \brief Implements TCP WRAPPER check.
*/
* \brief Implements TCP WRAPPER check.
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
+#ifdef WIN32
+#include <winsock.h>
+#endif
+
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-#ifdef WIN32
-#include <winsock.h>
-#else
+#if HAVE_NETINET_IN_H
#include <netinet/in.h>
#include <netinet/in.h>
-#include <netdb.h>
+#endif
+
+#if HAVE_ARPA_INET_H
#include <arpa/inet.h>
#include <arpa/inet.h>
-#include <netinet/tcp.h>
#endif
#if HAVE_SYS_SOCKET_H
#endif
#if HAVE_SYS_SOCKET_H
+/* freebsd wants this for AF_INET */
#include <sys/socket.h>
#endif
#include <sys/socket.h>
#endif
-#include <yaz/yconfig.h>
+#if HAVE_NETDB_H
+#include <netdb.h>
+#endif
+
#include <yaz/comstack.h>
#include <yaz/statserv.h>
#include <yaz/log.h>
#include <yaz/comstack.h>
#include <yaz/statserv.h>
#include <yaz/log.h>
@@
-40,13
+51,6
@@
int allow_severity = LOG_INFO; /* not YLOG !! */
int deny_severity = LOG_WARNING;
int allow_severity = LOG_INFO; /* not YLOG !! */
int deny_severity = LOG_WARNING;
-#ifdef LOG_DEBUG
-#undef LOG_DEBUG
-#endif
-#ifdef LOG_WARN
-#undef LOG_WARN
-#endif
-
#endif
int check_ip_tcpd(void *cd, const char *addr, int len, int type)
#endif
int check_ip_tcpd(void *cd, const char *addr, int len, int type)
@@
-60,7
+64,6
@@
int check_ip_tcpd(void *cd, const char *addr, int len, int type)
#if HAVE_TCPD_H
struct request_info request_info;
int i;
#if HAVE_TCPD_H
struct request_info request_info;
int i;
-#endif
char *host_name = 0, *host_addr = 0;
struct hostent *host;
char *host_name = 0, *host_addr = 0;
struct hostent *host;
@@
-71,7
+74,6
@@
int check_ip_tcpd(void *cd, const char *addr, int len, int type)
AF_INET)))
host_name = (char*) host->h_name;
host_addr = inet_ntoa(addr_in->sin_addr);
AF_INET)))
host_name = (char*) host->h_name;
host_addr = inet_ntoa(addr_in->sin_addr);
-#if HAVE_TCPD_H
if (host_addr)
request_init(&request_info, RQ_DAEMON, daemon_name,
RQ_CLIENT_NAME, host_name,
if (host_addr)
request_init(&request_info, RQ_DAEMON, daemon_name,
RQ_CLIENT_NAME, host_name,
@@
-84,12
+86,12
@@
int check_ip_tcpd(void *cd, const char *addr, int len, int type)
i = hosts_access(&request_info);
if (!i)
{
i = hosts_access(&request_info);
if (!i)
{
- yaz_log (YLOG_DEBUG, "access denied from %s",
- host_name ? host_name : host_addr);
+ yaz_log(YLOG_DEBUG, "access denied from %s",
+ host_name ? host_name : host_addr);
return 1;
}
return 1;
}
- yaz_log (YLOG_DEBUG, "access granted from %s",
- host_name ? host_name : host_addr);
+ yaz_log(YLOG_DEBUG, "access granted from %s",
+ host_name ? host_name : host_addr);
#endif
}
}
#endif
}
}
@@
-99,6
+101,7
@@
int check_ip_tcpd(void *cd, const char *addr, int len, int type)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab