diff options
| author | peter <peter@FreeBSD.org> | 1997-06-27 08:22:03 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1997-06-27 08:22:03 +0000 |
| commit | 63d61ea6e9374a89adcb36c3f5c3b759b9a82c41 (patch) | |
| tree | 42dba341377c853de43567a145b2a902b2039b15 /lib/libc/net/gethostbyht.c | |
| parent | 20250d8619bb0419032ebda7ca41de01e60bea7f (diff) | |
| download | FreeBSD-src-63d61ea6e9374a89adcb36c3f5c3b759b9a82c41.zip FreeBSD-src-63d61ea6e9374a89adcb36c3f5c3b759b9a82c41.tar.gz | |
Merge in bind-4.9.6 resolver changes. Note that they resolve the
overflow problem differently.
Diffstat (limited to 'lib/libc/net/gethostbyht.c')
| -rw-r--r-- | lib/libc/net/gethostbyht.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/libc/net/gethostbyht.c b/lib/libc/net/gethostbyht.c index 4e0f850..cf12f57 100644 --- a/lib/libc/net/gethostbyht.c +++ b/lib/libc/net/gethostbyht.c @@ -53,7 +53,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; -static char rcsid[] = "$Id$"; +static char rcsid[] = "$Id: gethostbyht.c,v 1.9 1997/02/22 15:00:07 peter Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -122,8 +122,7 @@ gethostent() 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) { @@ -160,12 +159,6 @@ gethostent() *cp++ = '\0'; } *q = NULL; - if (_res.options & RES_USE_INET6) { - char *bp = hostbuf; - int buflen = sizeof hostbuf; - - _map_v4v6_hostent(&host, &bp, &buflen); - } h_errno = NETDB_SUCCESS; return (&host); } |
