Index: query.c
--- query.c.orig	2003-11-15 13:46:00.000000000 +0100
+++ query.c	2003-11-15 20:54:38.000000000 +0100
@@ -64,7 +64,7 @@
 #include "util.h"
 
 #ifdef LIBWRAP
-#include <tcpd.h>
+#include "tcpd.h"
 
 int allow_severity = LOG_INFO;
 int deny_severity = LOG_NOTICE;
@@ -704,12 +704,10 @@
 			*t = 0;
 			
 #endif /* AXFR_DAEMON_PREFIX */
-			request_init(&request, RQ_DAEMON, AXFR_DAEMON, RQ_CLIENT_SIN, &q->addr, 0);
-			sock_methods(&request);	/* This is to work around the bug in libwrap */
+			request_init(&request, RQ_DAEMON, AXFR_DAEMON, RQ_CLIENT_ADDR, &q->addr, 0);
 			if(!hosts_access(&request)) {
 #ifdef AXFR_DAEMON_PREFIX
-				request_init(&request, RQ_DAEMON, axfr_daemon, RQ_CLIENT_SIN, &q->addr, 0);
-				sock_methods(&request);	/* This is to work around the bug in libwrap */
+				request_init(&request, RQ_DAEMON, axfr_daemon, RQ_CLIENT_ADDR, &q->addr, 0);
 				log_msg(LOG_ERR, "checking %s", axfr_daemon);
 				if(!hosts_access(&request)) {
 #endif /* AXFR_DAEMON_PREFIX */