From 0205fb778cd5d72235b8602368379406c0bfc28c Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 18 Jun 2020 16:23:59 +0200 Subject: [PATCH] net: prefer /etc/hosts over DNS when no /etc/nsswitch.conf is present Do not mimic glibc behavior if /etc/nsswitch.conf is missing. This will will likely be missing on musl libc systems and glibc systems will likely always have it, resulting in localhost lookup being done over DNS rather than from /etc/hosts. Do what makes most sense rather than making any assumption about the libc. Fixes #35305 --- src/net/conf.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/net/conf.go b/src/net/conf.go index 971b1a399a1bb8..66e2f3722be9b4 100644 --- a/src/net/conf.go +++ b/src/net/conf.go @@ -202,11 +202,6 @@ func (c *conf) hostLookupOrder(r *Resolver, hostname string) (ret hostLookupOrde // illumos defaults to "nis [NOTFOUND=return] files" return fallbackOrder } - if c.goos == "linux" { - // glibc says the default is "dns [!UNAVAIL=return] files" - // https://www.gnu.org/software/libc/manual/html_node/Notes-on-NSS-Configuration-File.html. - return hostLookupDNSFiles - } return hostLookupFilesDNS } if nss.err != nil {