X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftcpdchk.c;h=8cff3013e87c861fe7f2c5aa00c64dfb6e34030b;hb=8fba4cf2cac1cc543aa4c1063c78b449ebac44a7;hp=24bf471c3d0c1e37b1c469cc6dd450bc739ef551;hpb=88d3bedf772316f87e1996f655ccf8d1e2589755;p=yaz-moved-to-github.git

diff --git a/src/tcpdchk.c b/src/tcpdchk.c
index 24bf471..8cff301 100644
--- a/src/tcpdchk.c
+++ b/src/tcpdchk.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2011 Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -7,6 +7,10 @@
  * \brief Implements TCP WRAPPER check.
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 
@@ -47,13 +51,6 @@
 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)
@@ -67,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;
-#endif
             char *host_name = 0, *host_addr = 0;
             struct hostent *host;
 
@@ -78,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);
-#if HAVE_TCPD_H
             if (host_addr)
                 request_init(&request_info, RQ_DAEMON, daemon_name,
                              RQ_CLIENT_NAME, host_name,
@@ -95,8 +90,8 @@ int check_ip_tcpd(void *cd, const char *addr, int len, int type)
                          host_name ? host_name : host_addr);
                 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
         }
     }