From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 21 Nov 2009 01:43:52 +0000 (+1300)
Subject: Author: Francesco Chemolli <kinkie@squid-cache.org>
X-Git-Tag: SQUID_3_1_0_15~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea48d384313b0c7d818668a6d9166bf381170647;p=thirdparty%2Fsquid.git

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 9782883a14..cc0b60a525 100644
--- 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 648b07b5c1..d112d59ce2 100644
--- 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