From: Brian Wellington <source@isc.org>
Date: Mon, 2 Apr 2001 22:33:31 +0000 (+0000)
Subject: call inet_aton, not inet_pton when parsing resolv.conf
X-Git-Tag: v9.1.2rc1~35^2~24
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=765eb27068c542a58a894b6c90714d8ea31e315b;p=thirdparty%2Fbind9.git

call inet_aton, not inet_pton when parsing resolv.conf
---

diff --git a/lib/lwres/lwconfig.c b/lib/lwres/lwconfig.c
index c11d630d197..3631333a4d3 100644
--- a/lib/lwres/lwconfig.c
+++ b/lib/lwres/lwconfig.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwconfig.c,v 1.28 2001/03/06 23:02:03 bwelling Exp $ */
+/* $Id: lwconfig.c,v 1.29 2001/04/02 22:33:31 bwelling Exp $ */
 
 /***
  *** Module for parsing resolv.conf files.
@@ -65,11 +65,6 @@
 #define NS_IN6ADDRSZ	16
 #endif
 
-
-extern int lwres_net_pton(int af, const char *src, void *dst);
-extern const char *lwres_net_ntop(int af, const void *src, char *dst,
-				  size_t size);
-
 static lwres_result_t
 lwres_conf_parsenameserver(lwres_context_t *ctx,  FILE *fp);
 
@@ -435,7 +430,7 @@ lwres_create_addr(const char *buffer, lwres_addr_t *addr) {
 	unsigned char addrbuff[NS_IN6ADDRSZ];
 	unsigned int len;
 
-	if (lwres_net_pton(AF_INET, buffer, &addrbuff) == 1) {
+	if (lwres_net_aton(buffer, &addrbuff) == 1) {
 		unsigned char zeroaddress[] = {0, 0, 0, 0};
 		unsigned char loopaddress[] = {127, 0, 0, 1};
 		if (memcmp(addrbuff, zeroaddress, 4) == 0)