Add a resolv.conf option to specify the order in which getaddrinfo

PF_UNSPEC queries are made. While there change the default from inet6
first then inet4 to inet4 first then inet6, this prevents the many
people with IPv4 only connectivity from constantly trying to contact
IPv6 addresses, and also unbreaks many ports who don't use getaddrinfo
right.

(forgot the manpage bit).

1 files changed, 24 insertions, 2 deletions

diff --git a/share/man/man5/resolv.conf.5 b/share/man/man5/resolv.conf.5
index 3e8d37e850e..fef40e87d23 100644
--- a/share/man/man5/resolv.conf.5
+++ b/share/man/man5/resolv.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: resolv.conf.5,v 1.30 2008/08/15 14:57:19 djm Exp $
+.\"	$OpenBSD: resolv.conf.5,v 1.31 2009/06/04 18:06:58 pyr Exp $
 .\"	$NetBSD: resolv.conf.5,v 1.7 1996/03/06 18:22:16 scottr Exp $
 .\"
 .\" Copyright (c) 1986, 1991 The Regents of the University of California.
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)resolver.5	5.12 (Berkeley) 5/10/91
 .\"
-.Dd $Mdocdate: August 15 2008 $
+.Dd $Mdocdate: June 4 2009 $
 .Dt RESOLV.CONF 5
 .Os
 .Sh NAME
@@ -204,6 +204,28 @@ The IP address and optional network pairs are separated by slashes.
 Up to 10 pairs may be specified, e.g.:
 .Pp
 .Sy sortlist 130.155.160.0/255.255.240.0 130.155.0.0
+.It Sy family
+Specify the preferred order in which to issue query when
+.Xr getaddrinfo 3
+is called with PF_UNSPEC.
+By default IPv4 addresses will be queried first and then IPv6
+addresses.
+The list of addresses returned by
+.Xr getaddrinfo 3
+will thus have the IPv4 addresses first.
+The syntax is
+.Pp
+.Sy family family1 [family2]
+.Pp
+Where a maximum of two families can be specified and where family
+can be any of:
+.Pp
+.Bl -tag -width inet6
+.It Sy inet4
+for IPv4 queries
+.It Sy inet6
+for IPv6 queries
+.El
 .It Sy options
 Allows certain internal resolver variables to be modified.
 The syntax is: