From: deraadt <deraadt@openbsd.org>
Date: Sat, 17 Jul 2021 17:14:29 +0000 (+0000)
Subject: Don't document systems which rewrite/change resolv.conf.  Those systems can
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=93d8e9ea2aa5af59053daef867fe983a7c093a09;p=openbsd

Don't document systems which rewrite/change resolv.conf.  Those systems can
document their actions in their own manual pages.
ok kn
---

diff --git a/share/man/man5/resolv.conf.5 b/share/man/man5/resolv.conf.5
index 1cef19f18e7..49ee20b2a5c 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.60 2020/04/25 14:22:04 jca Exp $
+.\"	$OpenBSD: resolv.conf.5,v 1.61 2021/07/17 17:14:29 deraadt 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,11 +30,11 @@
 .\"
 .\"     @(#)resolver.5	5.12 (Berkeley) 5/10/91
 .\"
-.Dd $Mdocdate: April 25 2020 $
+.Dd $Mdocdate: July 17 2021 $
 .Dt RESOLV.CONF 5
 .Os
 .Sh NAME
-.Nm resolv.conf , resolv.conf.tail
+.Nm resolv.conf
 .Nd resolver configuration files
 .Sh DESCRIPTION
 The
@@ -59,29 +59,6 @@ install process
 if use of the DHCP protocol is specified for any interface
 or if any DNS nameservers are configured.
 .Pp
-If
-.Xr dhclient 8
-is used to configure an interface it
-will overwrite
-.Nm resolv.conf
-whenever the interface becomes the default gateway.
-The information written is generated from the DHCP options
-domain-name-servers, domain-name and domain-search and the
-contents of the file
-.Nm resolv.conf.tail
-are appended to the generated information.
-If dhclient has no domain-name-servers, no domain-name and
-no domain-search information then it will not
-overwrite the existing
-.Nm resolv.conf ,
-even if
-.Nm resolv.conf.tail
-exists.
-.Nm resolv.conf.tail
-is normally used to specify
-options that are not available via DHCP
-e.g. lookup or family.
-.Pp
 A keyword and its values must appear on a single line, and the keyword (e.g.\&
 .Ic nameserver )
 must start the line.
@@ -175,9 +152,6 @@ Only one
 .Ic search
 line should appear; if more than one is present, the last one found
 overwrites any values found in earlier lines.
-So if such a line appears in the
-.Nm resolv.conf.tail
-file, it should include all the domains that need to be searched.
 .It Ic sortlist
 Allows addresses returned by
 .Xr gethostbyname 3
@@ -303,8 +277,6 @@ overriding the
 .Ic search
 keyword of a system's
 .Nm resolv.conf
-or
-.Nm resolv.conf.tail
 file.
 .It Ev RES_OPTIONS
 A space-separated list of resolver options,
@@ -312,22 +284,19 @@ overriding the
 .Ic options
 keyword of a system's
 .Nm resolv.conf
-or
-.Nm resolv.conf.tail
 file.
 .El
 .Sh FILES
-.Bl -tag -width "/etc/resolv.conf.tailXX" -compact
+.Bl -tag -width "/etc/resolv.confXX" -compact
 .It Pa /etc/resolv.conf
-.It Pa /etc/resolv.conf.tail
 .El
 .Sh SEE ALSO
 .Xr gethostbyname 3 ,
 .Xr res_init 3 ,
 .Xr hosts 5 ,
 .Xr hostname 7 ,
-.Xr dhclient 8 ,
 .Xr nsd 8 ,
+.Xr resolvd 8 ,
 .Xr unbound 8 ,
 .Xr unwind 8
 .Sh HISTORY