 @@ -1,14 +1,14 @@
-.\"	$NetBSD: getaddrinfo.3,v 1.47 2009/10/02 02:45:29 tsarna Exp $
+.\"	$NetBSD: getaddrinfo.3,v 1.48 2009/10/02 06:49:23 cegger Exp $
 .\"	$KAME: getaddrinfo.3,v 1.36 2005/01/05 03:23:05 itojun Exp $
 .\"	$OpenBSD: getaddrinfo.3,v 1.35 2004/12/21 03:40:31 jaredy Exp $
 .\"
 .\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (C) 2000, 2001  Internet Software Consortium.
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies.
 .\"
 .\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
 .\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
 .\" AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
 @@ -250,47 +250,47 @@ with the link
 such as
 .Li ne0
 .Pc .
 An example is
 .Dq Li fe80::1%ne0 ,
 which means
 .Do
 .Li fe80::1
 on the link associated with the
 .Li ne0
 interface
 .Dc .
 .Pp
-The current implementation assumes a one-to-one relationship between
+The current implementation assumes an one-to-one relationship between
 the interface and link, which is not necessarily true from the specification.
 .Pp
 All of the information returned by
 .Fn getaddrinfo
 is dynamically allocated: the
 .Li addrinfo
 structures themselves as well as the socket address structures and
 the canonical host name strings included in the
 .Li addrinfo
 structures.
 .Pp
 Memory allocated for the dynamically allocated structures created by
 a successful call to
 .Fn getaddrinfo
 is released by the
 .Fn freeaddrinfo
 function.
 The
 .Fa ai
-pointer should be a
+pointer should be an
 .Li addrinfo
 structure created by a call to
 .Fn getaddrinfo
 or
 .Fn allocaddrinfo .
 The
 .Fn allocaddrinfo
 function is intended primarily for authors of
 .Xr nsdispatch 3
 plugins implementing
 .Fn getaddrinfo
 backends.
 .Fn allocaddrinfo

 @@ -1,14 +1,14 @@
-/*	$NetBSD: getaddrinfo.c,v 1.93 2009/10/02 02:45:29 tsarna Exp $	*/
+/*	$NetBSD: getaddrinfo.c,v 1.94 2009/10/02 06:49:23 cegger Exp $	*/
 /*	$KAME: getaddrinfo.c,v 1.29 2000/08/31 17:26:57 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -45,27 +45,27 @@
  * Note:
  * - The code filters out AFs that are not supported by the kernel,
  *   when globbing NULL hostname (to loopback, or wildcard).  Is it the right
  *   thing to do?  What is the relationship with post-RFC2553 AI_ADDRCONFIG
  *   in ai_flags?
  * - (post-2553) semantics of AI_ADDRCONFIG itself is too vague.
  *   (1) what should we do against numeric hostname (2) what should we do
  *   against NULL hostname (3) what is AI_ADDRCONFIG itself.  AF not ready?
  *   non-loopback address configured?  global address configured?
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getaddrinfo.c,v 1.93 2009/10/02 02:45:29 tsarna Exp $");
+__RCSID("$NetBSD: getaddrinfo.c,v 1.94 2009/10/02 06:49:23 cegger Exp $");
 #endif /* LIBC_SCCS and not lint */
 #include "namespace.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h>
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
 @@ -1017,27 +1017,27 @@ ip6_str2scopeid(char *scope, struct sock
 	_DIAGASSERT(scope != NULL);
 	_DIAGASSERT(sin6 != NULL);
 	_DIAGASSERT(scopeid != NULL);
 	a6 = &sin6->sin6_addr;
 	/* empty scopeid portion is invalid */
 	if (*scope == '\0')
 		return -1;
 	if (IN6_IS_ADDR_LINKLOCAL(a6) || IN6_IS_ADDR_MC_LINKLOCAL(a6)) {
 		/*
-		 * We currently assume a one-to-one mapping between links
+		 * We currently assume an one-to-one mapping between links
 		 * and interfaces, so we simply use interface indices for
 		 * like-local scopes.
 		 */
 		*scopeid = if_nametoindex(scope);
 		if (*scopeid == 0)
 			goto trynumeric;
 		return 0;
+	}
 	/* still unclear about literal, allow numeric only - placeholder */
 	if (IN6_IS_ADDR_SITELOCAL(a6) || IN6_IS_ADDR_MC_SITELOCAL(a6))
 		goto trynumeric;
 	if (IN6_IS_ADDR_MC_ORGLOCAL(a6))
 @@ -1789,27 +1789,27 @@ res_searchN(const char *name, struct res
 	hp = (HEADER *)(void *)target->answer;	/*XXX*/
 	errno = 0;
 	h_errno = HOST_NOT_FOUND;	/* default, if we never query */
 	dots = 0;
 	for (cp = name; *cp; cp++)
 		dots += (*cp == '.');
 	trailing_dot = 0;
 	if (cp > name && *--cp == '.')
 		trailing_dot++;
 	/*
-	 * if there aren't any dots, it could be a user-level alias
+	 * if there aren't any dots, it could be an user-level alias
 	 */
 	if (!dots && (cp = __hostalias(name)) != NULL) {
 		ret = res_queryN(cp, target, res);
 		return ret;
+	}
 	/*
 	 * If there are dots in the name already, let's just give it a try
 	 * 'as is'.  The threshold can be set with the "ndots" option.
 	 */
 	saved_herrno = -1;
 	if (dots >= res->ndots) {
 		ret = res_querydomainN(name, NULL, target, res);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gethnamaddr.c,v 1.73 2007/01/27 22:27:35 christos Exp $	*/
+/*	$NetBSD: gethnamaddr.c,v 1.74 2009/10/02 06:49:23 cegger Exp $	*/
 /*
  * ++Copyright++ 1985, 1988, 1993
  * -
  * Copyright (c) 1985, 1988, 1993
  *    The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -47,27 +47,27 @@
  * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  * -
  * --Copyright--
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
 static char rcsid[] = "Id: gethnamaddr.c,v 8.21 1997/06/01 20:34:37 vixie Exp ";
 #else
-__RCSID("$NetBSD: gethnamaddr.c,v 1.73 2007/01/27 22:27:35 christos Exp $");
+__RCSID("$NetBSD: gethnamaddr.c,v 1.74 2009/10/02 06:49:23 cegger Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 #if defined(_LIBC)
 #include "namespace.h"
 #endif
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h>
 #include <assert.h>
 @@ -563,27 +563,27 @@ gethostbyname_internal(const char *name,
 	case AF_INET6:
 		size = IN6ADDRSZ;
 		break;
 	default:
 		h_errno = NETDB_INTERNAL;
 		errno = EAFNOSUPPORT;
 		return NULL;
+	}
 	host.h_addrtype = af;
 	host.h_length = size;
 	/*
-	 * if there aren't any dots, it could be a user-level alias.
+	 * if there aren't any dots, it could be an user-level alias.
 	 * this is also done in res_nquery() since we are not the only
 	 * function that looks up host names.
 	 */
 	if (!strchr(name, '.') && (cp = __hostalias(name)))
 		name = cp;
 	/*
 	 * disallow names consisting only of digits/dots, unless
 	 * they end in a dot.
 	 */
 	if (isdigit((u_char) name[0]))
 		for (cp = name;; ++cp) {
 			if (!*cp) {

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: resolver.3,v 1.22 2009/06/08 16:55:30 christos Exp $
+.\"	$NetBSD: resolver.3,v 1.23 2009/10/02 06:49:23 cegger Exp $
 .\" Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies.
 .\"
 .\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
 .\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
 .\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 @@ -307,27 +307,27 @@ This options causes the
 .Fn res_send
 to rotate the list of nameservers in
 .Fa statp->nsaddr_list
+/
 .Fa _res.nsaddr_list .
 .It Dv RES_KEEPTSIG
 This option causes
 .Fn res_nsendsigned
 to leave the message unchanged after TSIG verification; otherwise the TSIG
 record would be removed and the header updated.
 .It Dv RES_NOTLDQUERY
 This option causes
 .Fn res_nsearch
-to not attempt to resolve a unqualified name as if it were a top level
+to not attempt to resolve an unqualified name as if it were a top level
 domain (TLD).
 This option can cause problems if the site has "localhost" as a TLD rather
 than having localhost on one or more elements of the search list.
 This option has no effect if neither
 .Dv RES_DEFNAMES
 or
 .Dv RES_DNSRCH
 is set.
 .El
 .Pp
 The
 .Fn res_ninit
+/