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

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