Add resolv.conf(5) option to force lookups by TCP: "options tcp"

Also Extend "nameserver" declaration syntax to support port
numbers.  To avoid ambiguity these are only parsed when the address
is enclosed in square brackets, e.g. "nameserver [127.0.0.1]:5353"

Together these changes make forwarding DNS over a SSH tunnel very
easy, but unfortunately some programs in ports/ implement their
own resolvers (e.g. firefox). These will need to be modified to
support these options separately.

fixes jsing@ reyk@
ok deraadt@ millert@ krw@ + "I like it" from lots

1 files changed, 9 insertions, 2 deletions

diff --git a/share/man/man5/resolv.conf.5 b/share/man/man5/resolv.conf.5
index f038fe200a3..3e8d37e850e 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.29 2007/05/31 19:19:58 jmc Exp $
+.\"	$OpenBSD: resolv.conf.5,v 1.30 2008/08/15 14:57:19 djm 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: May 31 2007 $
+.Dd $Mdocdate: August 15 2008 $
 .Dt RESOLV.CONF 5
 .Os
 .Sh NAME
@@ -108,6 +108,10 @@ Scoped IPv6 address notation is accepted as well
 (see
 .Xr inet6 4
 for details).
+A non-standard port may be specified using
+.Ar [host]:port
+syntax.
+.Pp
 Up to
 .Dv MAXNS
 (currently 3) name servers may be listed, one per line.
@@ -242,6 +246,9 @@ The default for
 .Ar n
 is 1, meaning that if there are any dots in a name, the name will be tried
 first as an absolute name before any search list elements are appended to it.
+.It Sy tcp
+Forces the use of TCP for queries.
+Normal behaviour is to query via UDP but fall back to TCP on failure.
 .El
 .El
 .Pp