diff options
| author |   jmc <jmc@openbsd.org> | 2019-02-26 20:32:23 +0000 |
|---|---|---|
| committer | jmc <jmc@openbsd.org> | 2019-02-26 20:32:23 +0000 |
| commit | 674ce36fb47eb088eb466d0728f71836765487a1 (patch) | |
| tree | d5b7fb91d441b2249bb311a741e1fe76d6c1589e | |
| parent | Move release check up front. (diff) | |
| download | wireguard-openbsd-674ce36fb47eb088eb466d0728f71836765487a1.tar.xz wireguard-openbsd-674ce36fb47eb088eb466d0728f71836765487a1.zip | |
add domain-search to the list of options capable of adding to resolv.conf;
confirmed by and ok krw
| -rw-r--r-- | sbin/dhclient/dhclient.8 | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sbin/dhclient/dhclient.8 b/sbin/dhclient/dhclient.8 index cb9b7260d84..90070a4a3ce 100644 --- a/sbin/dhclient/dhclient.8 +++ b/sbin/dhclient/dhclient.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: dhclient.8,v 1.38 2019/01/18 07:39:53 krw Exp $ +.\" $OpenBSD: dhclient.8,v 1.39 2019/02/26 20:32:23 jmc Exp $ .\" .\" Copyright (c) 1997 The Internet Software Consortium. .\" All rights reserved. @@ -35,7 +35,7 @@ .\" Enterprises. To learn more about the Internet Software Consortium, .\" see ``http://www.isc.org/isc''. To learn more about Vixie .\" Enterprises, see ``http://www.vix.com''. -.Dd $Mdocdate: January 18 2019 $ +.Dd $Mdocdate: February 26 2019 $ .Dt DHCLIENT 8 .Os .Sh NAME @@ -197,10 +197,11 @@ Once the interface is configured, constructs a .Xr resolv.conf 5 file. -It does this only when one or both of the options -.Cm domain-name -and -.Cm domain-name-servers +It does this only if any of the options +.Cm domain-name , +.Cm domain-name-servers , +or +.Cm domain-search are present (note that these options may be offered by the DHCP server but suppressed by .Xr dhclient.conf 5 ) . |