From: amosjeffries <>
Date: Wed, 19 Dec 2007 09:36:26 +0000 (+0000)
Subject: Remove last remains of inet_aton() from squid.
X-Git-Tag: BASIC_TPROXY4~241
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cc6e4c33c4d246cfc1ef15fa3decb74cba2cab3;p=thirdparty%2Fsquid.git

Remove last remains of inet_aton() from squid.

Squid now uses inet_pton IP-neutral function instead.
---

diff --git a/configure.in b/configure.in
index 30c633f3ac..032e3eb33c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.491 2007/12/15 03:55:01 amosjeffries Exp $
+dnl  $Id: configure.in,v 1.492 2007/12/19 02:36:26 amosjeffries Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@ AM_CONFIG_HEADER(include/autoconf.h)
 AC_CONFIG_AUX_DIR(cfgaux)
 AC_CONFIG_SRCDIR([src/main.cc])
 AM_INIT_AUTOMAKE([tar-ustar])
-AC_REVISION($Revision: 1.491 $)dnl
+AC_REVISION($Revision: 1.492 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -2322,7 +2322,6 @@ if test $ac_cv_lib_bind_gethostbyname = "no" ; then
 		echo "skipping libresolv checks for $host"
 		;;
 	*)
-		AC_CHECK_LIB(resolv, inet_aton, AC_CHECK_LIB(44bsd, inet_aton))
 		AC_CHECK_LIB(resolv, main)
 		;;
     esac
diff --git a/lib/rfc1035.c b/lib/rfc1035.c
index 3faede1aec..c9db5520b4 100644
--- a/lib/rfc1035.c
+++ b/lib/rfc1035.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: rfc1035.c,v 1.51 2007/12/14 23:11:45 amosjeffries Exp $
+ * $Id: rfc1035.c,v 1.52 2007/12/19 02:36:27 amosjeffries Exp $
  *
  * Low level DNS protocol routines
  * AUTHOR: Duane Wessels
@@ -768,7 +768,7 @@ main(int argc, char *argv[])
 	strtok(input, "\r\n");
 	memset(buf, '\0', 512);
 	sz = 512;
-	if (inet_aton(input, &junk)) {
+	if (inet_pton(AF_INET, input, &junk)) {
 	    sid = rfc1035BuildPTRQuery(junk, buf, &sz);
 	} else {
 	    sid = rfc1035BuildAQuery(input, buf, &sz);