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

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