diff options
Diffstat (limited to 'libgo/go/net/conf.go')
| -rw-r--r-- | libgo/go/net/conf.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libgo/go/net/conf.go b/libgo/go/net/conf.go index d064d9e..b0f1b79 100644 --- a/libgo/go/net/conf.go +++ b/libgo/go/net/conf.go @@ -69,7 +69,7 @@ func initConfVal() { // Darwin pops up annoying dialog boxes if programs try to do // their own DNS requests. So always use cgo instead, which // avoids that. - if runtime.GOOS == "darwin" { + if runtime.GOOS == "darwin" || runtime.GOOS == "ios" { confVal.forceCgoLookupHost = true return } @@ -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 { |