From 0921ce4ab089dca648a4d25f8e7dad8942b84567 Mon Sep 17 00:00:00 2001 From: Simon Paillard Date: Sat, 17 May 2014 17:12:09 +0200 Subject: [PATCH] resolver.3, host.conf.5: host.conf '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, and http://bugs.debian.org/344233. Signed-off-by: Michael Kerrisk --- man3/resolver.3 | 2 +- man5/host.conf.5 | 42 +++++++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/man3/resolver.3 b/man3/resolver.3 index 968c2f17d..4b1ddb075 100644 --- a/man3/resolver.3 +++ b/man3/resolver.3 @@ -90,7 +90,7 @@ The .BR res_init () function reads the configuration files (see .BR resolv.conf (5)) -to get the default domain name, search order and name +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 a289cb4e9..e3d90730b 100644 --- a/man5/host.conf.5 +++ b/man5/host.conf.5 @@ -23,7 +23,7 @@ .\" %%%LICENSE_END .\" .\" 2003-08-23 Martin Schulze Updated according to glibc 2.3.2 -.TH HOST.CONF 5 2003-08-23 "Linux" "Linux System Administration" +.TH HOST.CONF 5 2014-05-17 "Linux" "Linux System Administration" .SH NAME host.conf \- resolver configuration file .SH DESCRIPTION @@ -32,15 +32,7 @@ The file 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 . -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 . +The following keywords are recognized: .TP .I trim This keyword may be listed more than once. @@ -133,19 +125,14 @@ Reordering is done for all lookup methods. The default value is .IR off . .SH ENVIRONMENT -There are six environment variables that can be used to allow users to +The following environment variables can be used to allow users to override the behavior which is configured in -.IR /etc/host.conf . +.IR /etc/host.conf : .TP .B RESOLV_HOST_CONF 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 @@ -196,8 +183,25 @@ and a new environment variable can take arguments like .IR off ", " nowarn " and " warn . Line comments can appear anywhere and not only at the beginning of a line. +.SS Historical +In glibc 2.4 and earlier, the following keyword is recognized: +.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 . +The +.B RESOLV_SERV_ORDER +environment variable could be used to override the +.I order +command. +.PP +The +.BR nsswitch.conf (5) +file is the modern way of controlling the order of host lookups. .SH SEE ALSO .BR gethostbyname (3), +.BR nsswitch.conf (5) .BR hostname (7), -.BR named (8), -.BR resolv+ (8) +.BR named (8)