Remove /etc/host.conf, which was automatically generated from
nsswitch.conf for backward compatibility. This file was used over 19 years ago, before introducing nsdispatch() in the name-service lookup APIs. MFC after: 3 days
This commit is contained in:
parent
c165f4ab69
commit
d80eccfc98
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=359068
@ -36,6 +36,10 @@
|
||||
# xargs -n1 | sort | uniq -d;
|
||||
# done
|
||||
|
||||
# 20200318: host.conf was deprecated a long time ago.
|
||||
OLD_FILES+=etc/host.conf
|
||||
OLD_FILES+=etc/rc.d/nsswitch
|
||||
|
||||
# 20200310: new clang import which bumps version from 9.0.1 to 10.0.0.
|
||||
OLD_FILES+=usr/lib/clang/9.0.1/include/cuda_wrappers/algorithm
|
||||
OLD_FILES+=usr/lib/clang/9.0.1/include/cuda_wrappers/complex
|
||||
|
@ -74,7 +74,6 @@ CONFS= DAEMON \
|
||||
nfsuserd \
|
||||
nisdomain \
|
||||
${_nscd} \
|
||||
nsswitch \
|
||||
ntpdate \
|
||||
${_opensm} \
|
||||
os-release \
|
||||
|
@ -1,104 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 1993 - 2004 The FreeBSD Project. All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# 2. Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
|
||||
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
# ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
|
||||
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
# SUCH DAMAGE.
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
# PROVIDE: nsswitch
|
||||
# REQUIRE: root
|
||||
# BEFORE: NETWORK
|
||||
|
||||
. /etc/rc.subr
|
||||
|
||||
name="nsswitch"
|
||||
desc="Name-service switch"
|
||||
start_cmd="nsswitch_start"
|
||||
stop_cmd=":"
|
||||
|
||||
generate_host_conf()
|
||||
{
|
||||
local _cont _sources
|
||||
|
||||
nsswitch_conf=$1; shift;
|
||||
host_conf=$1; shift;
|
||||
|
||||
_cont=0
|
||||
_sources=""
|
||||
while read line; do
|
||||
line=${line##[ ]}
|
||||
case $line in
|
||||
hosts:*)
|
||||
;;
|
||||
*)
|
||||
if [ $_cont -ne 1 ]; then
|
||||
continue
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
if [ "${line%\\}" = "${line}\\" ]; then
|
||||
_cont=1
|
||||
fi
|
||||
line=${line#hosts:}
|
||||
line=${line%\\}
|
||||
line=${line%%#*}
|
||||
_sources="${_sources}${_sources:+ }$line"
|
||||
done < $nsswitch_conf
|
||||
|
||||
echo "# Auto-generated from nsswitch.conf" > $host_conf
|
||||
for _s in ${_sources}; do
|
||||
case $_s in
|
||||
files)
|
||||
echo "hosts" >> $host_conf
|
||||
;;
|
||||
dns)
|
||||
echo "dns" >> $host_conf
|
||||
;;
|
||||
nis)
|
||||
echo "nis" >> $host_conf
|
||||
;;
|
||||
cache | *=*)
|
||||
;;
|
||||
*)
|
||||
echo "Warning: unrecognized source [$_s]" >&2
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
nsswitch_start()
|
||||
{
|
||||
# Generate host.conf for compatibility
|
||||
#
|
||||
if [ ! -f "/etc/host.conf" -o \
|
||||
"/etc/host.conf" -ot "/etc/nsswitch.conf" ]
|
||||
then
|
||||
echo 'Generating host.conf.'
|
||||
generate_host_conf /etc/nsswitch.conf /etc/host.conf
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
load_rc_config $name
|
||||
run_rc_command "$1"
|
Loading…
Reference in New Issue
Block a user