Control: tag -1 +patch Michael,
More resolver doc updates. On Thu, Feb 23, 2006 at 03:01:25PM +0100, Samuel Thibault wrote: > /etc/host.conf and /etc/nsswitch.conf do not overlap: /etc/host.conf's > "order" line is replaced by nsswitch.conf nowadays. > > See http://sources.redhat.com/bugzilla/show_bug.cgi?id=2389 for a query > for cleanup in libc. And http://repo.or.cz/w/glibc.git/commit/b9c65d0902e5890c4f025b574725154032f8120a > What should be removed from the manpage is documentation about the > "order" line and RESOLV_SERV_ORDER (since they do not work any more) and > the reference to /etc/resolv.conf and /etc/hosts (and they should rather > be documented in the nsswitch.conf manpage). I cannot find which glibc versions uses order line in host.conf before nsswitch.conf is used. Together with the fact this change happened ~7 years ago, here is a patch *removing* the 'order line', and adding nsswitch.conf(5) in references. -- Simon Paillard
>From 0dfc75db2b27b4ee9650d11f168f9cb4f2f28c85 Mon Sep 17 00:00:00 2001 From: Simon Paillard <spaill...@debian.org> Date: Mon, 19 Nov 2012 23:28:58 +0100 Subject: [PATCH] host.conf(5): order option deprecated, replaced by nsswitch.conf(5) http://www.sourceware.org/bugzilla/show_bug.cgi?id=2389 http://repo.or.cz/w/glibc.git/commit/b9c65d0902e5890c4f025b574725154032f8120a Reported at http://bugs.debian.org/270368 http://bugs.debian.org/396633 --- man3/resolver.3 | 2 +- man5/host.conf.5 | 14 ++------------ man5/resolv.conf.5 | 4 +++- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/man3/resolver.3 b/man3/resolver.3 index 991b263..2cd4ec7 100644 --- a/man3/resolver.3 +++ b/man3/resolver.3 @@ -87,7 +87,7 @@ domain name servers. The .BR res_init () function reads the configuration files (see -resolv.conf(5)) to get the default domain name, search order and name +resolv.conf(5)) to get the default domain name and name server address(es). If no server is given, the local host is tried. If no domain is given, that associated with the local host is used. diff --git a/man5/host.conf.5 b/man5/host.conf.5 index 189e2e9..ed1403d 100644 --- a/man5/host.conf.5 +++ b/man5/host.conf.5 @@ -33,15 +33,9 @@ contains configuration information specific to the resolver library. It should contain one configuration keyword per line, followed by appropriate configuration information. The keywords recognized are -.IR order ", " trim ", " multi ", " nospoof ", " spoof ", and " reorder . +.IR trim ", " multi ", " nospoof ", " spoof ", and " reorder . These keywords are described below. .TP -.I order -This keyword specifies how host lookups are to be performed. -It should be followed by one or more lookup methods, separated by commas. -Valid methods are -.IR bind ", " hosts ", and " nis . -.TP .I trim This keyword may be listed more than once. Each time it should be @@ -141,11 +135,6 @@ override the behavior which is configured in If set this variable points to a file that should be read instead of .IR /etc/host.conf . .TP -.B RESOLV_SERV_ORDER -Overrides the -.I order -command. -.TP .B RESOLV_SPOOF_CHECK Overrides the .IR nospoof ", " spoofalert " and " spoof @@ -200,4 +189,5 @@ Line comments can appear anywhere and not only at the beginning of a line. .BR gethostbyname (3), .BR hostname (7), .BR named (8), +.BR nsswitch.conf (5), .BR resolv+ (8) diff --git a/man5/resolv.conf.5 b/man5/resolv.conf.5 index 9a3ca54..282f748 100644 --- a/man5/resolv.conf.5 +++ b/man5/resolv.conf.5 @@ -134,6 +134,7 @@ sets .BR RES_DEBUG in .IR _res.options . +This option needs glibc to be build with debugging enabled. .TP .BI ndots: n .\" Since glibc 2.2 @@ -275,6 +276,7 @@ in the first column are treated as comments. .BR gethostbyname (3), .BR resolver (3), .BR hostname (7), -.BR named (8) +.BR named (8), +.BR nsswitch.conf (5) .br Name Server Operations Guide for BIND -- 1.7.10.4
