Author: Francesco Chemolli <kinkie@squid-cache.org>

Dnsserver and resolver fixes.

* A variable was not defined under certain autoconf-related conditions.
* inet_ntop header is required to be included when inet_ntop.c built.

diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c
index 9782883a14b8b153d801facc20a558ca2ce5bf4a..cc0b60a525955e24f2e4a18974300c45109ac610 100644 (file)
--- a/lib/inet_ntop.c
+++ b/lib/inet_ntop.c
@@ -22,6 +22,7 @@
 #include "config.h"
 
 #ifndef HAVE_INET_NTOP
+#include "inet_ntop.h"
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")

diff --git a/src/dnsserver.cc b/src/dnsserver.cc
index 648b07b5c1a9ab6c23d507077c5e954708c2673c..d112d59ce22666882f0d2e8edc7ef51d55940268 100644 (file)
--- a/src/dnsserver.cc
+++ b/src/dnsserver.cc
@@ -465,9 +465,9 @@ main(int argc, char *argv[])
     char request[512];
     char *t = NULL;
     int c;
+    int opt_s = 0;
 
 #if HAVE_RES_INIT
-    int opt_s = 0;
     res_init();
 #endif