Blame SOURCES/1928160-mpo-8.5.0.0-resolv.conf.5.patch

bb1c30
From 900812481ed9f7bd425301399ab22196aa9d1324 Mon Sep 17 00:00:00 2001
bb1c30
From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
bb1c30
Date: Fri, 9 Jul 2021 17:45:37 +0200
bb1c30
Subject: [PATCH 2/2] resolv.conf.5: update information about search list and
bb1c30
 attempt to clarify domain/search interaction
bb1c30
bb1c30
---
bb1c30
 man-pages/man5/resolv.conf.5 | 47 +++++++++++++++++++-----------------
bb1c30
 1 file changed, 25 insertions(+), 22 deletions(-)
bb1c30
bb1c30
diff --git a/man-pages/man5/resolv.conf.5 b/man-pages/man5/resolv.conf.5
bb1c30
index 93c6b47..a14e0ca 100644
bb1c30
--- a/man-pages/man5/resolv.conf.5
bb1c30
+++ b/man-pages/man5/resolv.conf.5
bb1c30
@@ -39,10 +39,9 @@ The configuration file is considered a trusted source of DNS information
bb1c30
 (e.g., DNSSEC AD-bit information will be returned unmodified from this
bb1c30
 source).
bb1c30
 .PP
bb1c30
-If this file does not exist,
bb1c30
-only the name server on the local machine will be queried;
bb1c30
-the domain name is determined from the hostname
bb1c30
-and the domain search path is constructed from the domain name.
bb1c30
+If this file does not exist, only the name server on the local machine
bb1c30
+will be queried, and the search list contains the local domain name
bb1c30
+determined from the hostname.
bb1c30
 .PP
bb1c30
 The different configuration options are:
bb1c30
 .TP
bb1c30
@@ -63,20 +62,15 @@ try the next, until out of name servers,
bb1c30
 then repeat trying all the name servers
bb1c30
 until a maximum number of retries are made.)
bb1c30
 .TP
bb1c30
-\fBdomain\fP Local domain name.
bb1c30
-Most queries for names within this domain can use short names
bb1c30
-relative to the local domain.
bb1c30
-If set to \(aq.\(aq, the root domain is considered.
bb1c30
-If no \fBdomain\fP entry is present, the domain is determined
bb1c30
-from the local hostname returned by
bb1c30
-.BR gethostname (2);
bb1c30
-the domain part is taken to be everything after the first \(aq.\(aq.
bb1c30
-Finally, if the hostname does not contain a domain part, the root
bb1c30
-domain is assumed.
bb1c30
-.TP
bb1c30
 \fBsearch\fP Search list for host-name lookup.
bb1c30
-The search list is normally determined from the local domain name;
bb1c30
-by default, it contains only the local domain name.
bb1c30
+By default, the search list contains one entry, the local domain name.
bb1c30
+It is determined from the local hostname returned by
bb1c30
+.BR gethostname (2);
bb1c30
+the local domain name is taken to be everything after the first
bb1c30
+\(aq.\(aq.
bb1c30
+Finally, if the hostname does not contain a \(aq.\(aq, the
bb1c30
+root domain is assumed as the local domain name.
bb1c30
+.IP
bb1c30
 This may be changed by listing the desired domain search path
bb1c30
 following the \fIsearch\fP keyword with spaces or tabs separating
bb1c30
 the names.
bb1c30
@@ -104,8 +98,21 @@ traffic if the servers for the listed domains are not local,
bb1c30
 and that queries will time out if no server is available
bb1c30
 for one of the domains.
bb1c30
 .IP
bb1c30
-The search list is currently limited to six domains
bb1c30
+If there are multiple
bb1c30
+.B search
bb1c30
+directives, only the search list from the last instance is used.
bb1c30
+.IP
bb1c30
+In glibc 2.25 and earlier, the search list is limited to six domains
bb1c30
 with a total of 256 characters.
bb1c30
+Since glibc 2.26,
bb1c30
+.\" glibc commit 3f853f22c87f0b671c0366eb290919719fa56c0e
bb1c30
+the search list is unlimited.
bb1c30
+.IP
bb1c30
+The
bb1c30
+.B domain
bb1c30
+directive is an obsolete name for the
bb1c30
+.B search
bb1c30
+directive that handles one search list entry only.
bb1c30
 .TP
bb1c30
 \fBsortlist\fP
bb1c30
 This option allows addresses returned by
bb1c30
@@ -312,10 +319,6 @@ in
bb1c30
 This option disables automatic reloading of a changed configuration file.
bb1c30
 .RE
bb1c30
 .PP
bb1c30
-The \fIdomain\fP and \fIsearch\fP keywords are mutually exclusive.
bb1c30
-If more than one instance of these keywords is present,
bb1c30
-the last instance wins.
bb1c30
-.PP
bb1c30
 The \fIsearch\fP keyword of a system's \fIresolv.conf\fP file can be
bb1c30
 overridden on a per-process basis by setting the environment variable
bb1c30
 .B LOCALDOMAIN
bb1c30
-- 
bb1c30
2.31.1
bb1c30