Add a rfc1035 data type and use it to describe

domain-search. Mention that dhcpd(8) still calls
this option-119. Also mention that the information
provided by this option will be used in preference
to domain-name when constructing resolv.conf(5).

Merciless prodding by florian@ and kn@.

1 files changed, 29 insertions, 1 deletions

diff --git a/usr.sbin/dhcpd/dhcp-options.5 b/usr.sbin/dhcpd/dhcp-options.5
index 3ae6a8ee7fd..48914b4eb1a 100644
--- a/usr.sbin/dhcpd/dhcp-options.5
+++ b/usr.sbin/dhcpd/dhcp-options.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhcp-options.5,v 1.27 2019/04/01 10:25:52 krw Exp $
+.\"	$OpenBSD: dhcp-options.5,v 1.28 2019/04/01 11:21:49 krw Exp $
 .\"
 .\" Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.
 .\" All rights reserved.
@@ -78,6 +78,13 @@ data type specifies a network in CIDR notion.
 e.g. 1.2.3/24.
 .Pp
 The
+.Ar rfc1035
+data type specifies a list of domain names compressed
+as described in Section 4.1.4 of RFC 1035.
+The compressed list takes the form of a series of
+octets specified in hexadecimal, separated by colons.
+.Pp
+The
 .Ar int32
 data type specifies a signed 32-bit integer.
 The
@@ -285,6 +292,27 @@ The
 option specifies a list of Domain Name System name servers
 available to the client.
 Servers should be listed in order of preference.
+.It Ic option domain-search Ar rfc1035 ;
+The
+.Ic domain-search
+option specifies a list of the domain names that should be
+used during DNS name resolution.
+.Pp
+When
+.Xr dhclient 8
+constructs
+.Xr resolv.conf 5
+it will use this list of domains in preference to any information
+provided by the
+.Ic domain-name
+option
+.Pp
+Note that
+.Xr dhcpd 8
+calls this option
+.Ic option-119
+instead of
+.Ic domain-search .
 .It Ic option extensions-path Ar string ;
 A string to specify a file, retrievable via TFTP, which contains information
 which can be interpreted in the same way as the 64-octet vendor-extension