Minor refactor in tcpip code

[yaz-moved-to-github.git] / src / tcpdchk.c

diff --git a/src/tcpdchk.c b/src/tcpdchk.c
index 24bf471..f984170 100644 (file)
--- 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) 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,36 +64,33 @@ 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;
 
             struct sockaddr_in *addr_in = (struct sockaddr_in *) addr;
-            
+
             if ((host = gethostbyaddr((char*)&addr_in->sin_addr,
                                       sizeof(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)
+            if (host_addr && host_name)
                 request_init(&request_info, RQ_DAEMON, daemon_name,
                              RQ_CLIENT_NAME, host_name,
                              RQ_CLIENT_SIN, addr_in,
                              RQ_CLIENT_ADDR, host_addr, 0);
             else
                 request_init(&request_info, RQ_DAEMON, daemon_name,
-                             RQ_CLIENT_SIN, addr_in,
-                             RQ_CLIENT_ADDR, host_addr, 0);
+                             RQ_CLIENT_SIN, addr_in, 0);
             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;
             }
-            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
         }
     }