From e4c761043a1549e36e2e3f08aa44ca103b28ef51 Mon Sep 17 00:00:00 2001
From: itojun <>
Date: Mon, 3 Jan 2000 11:51:08 +0000
Subject: always enable IPv6 address in /etc/hosts (via _gethtent()). clarify
 RES_USE_INET6.  the use of this bit is not meaningful on openbsd (as we don't
 have mapped addr support in kernel).

---
 src/lib/libc/net/gethostnamadr.c | 5 ++---
 src/lib/libc/net/resolver.3      | 8 ++++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libc/net/gethostnamadr.c b/src/lib/libc/net/gethostnamadr.c
index 13a8eef846..bdb3729218 100644
--- a/src/lib/libc/net/gethostnamadr.c
+++ b/src/lib/libc/net/gethostnamadr.c
@@ -52,7 +52,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: gethostnamadr.c,v 1.39 1999/12/11 08:40:17 itojun Exp $";
+static char rcsid[] = "$OpenBSD: gethostnamadr.c,v 1.40 2000/01/03 11:51:07 itojun Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -825,8 +825,7 @@ _gethtent()
 	if (!(cp = strpbrk(p, " \t")))
 		goto again;
 	*cp++ = '\0';
-	if ((_res.options & RES_USE_INET6) &&
-	    inet_pton(AF_INET6, p, host_addr) > 0) {
+	if (inet_pton(AF_INET6, p, host_addr) > 0) {
 		af = AF_INET6;
 		len = IN6ADDRSZ;
 	} else if (inet_pton(AF_INET, p, host_addr) > 0) {
diff --git a/src/lib/libc/net/resolver.3 b/src/lib/libc/net/resolver.3
index 27d393193d..9b2471d823 100644
--- a/src/lib/libc/net/resolver.3
+++ b/src/lib/libc/net/resolver.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: resolver.3,v 1.12 1999/07/05 04:41:00 aaron Exp $
+.\"	$OpenBSD: resolver.3,v 1.13 2000/01/03 11:51:08 itojun Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -171,7 +171,11 @@ This is used by the standard host lookup routine
 .Xr gethostbyname 3 .
 This option is enabled by default.
 .It Dv RES_USE_INET6
-Enable support for IPv6 addresses.
+Enables support for IPv6-only applications.
+This causes IPv4 addresses to be returned as an IPv4 mapped address.
+For example, 10.1.1.1 will be returned as ::ffff:10.1.1.1.
+The option is not meaningful on
+.Ox .
 .El
 .Pp
 The
-- 
cgit v1.2.3-55-g6feb