diff options
| -rw-r--r-- | src/net/conf.go | 34 | ||||
| -rw-r--r-- | src/net/conf_test.go | 20 |
2 files changed, 44 insertions, 10 deletions
diff --git a/src/net/conf.go b/src/net/conf.go index cec996f7f0..1db166c9e3 100644 --- a/src/net/conf.go +++ b/src/net/conf.go @@ -360,9 +360,12 @@ func (c *conf) lookupOrder(r *Resolver, hostname string) (ret hostLookupOrder, d return fallbackOrder, dnsConf } - var filesSource, dnsSource, unknownSource bool + var hasDNSSource bool + var hasDNSSourceChecked bool + + var filesSource, dnsSource bool var first string - for _, src := range srcs { + for i, src := range srcs { if src.source == "files" || src.source == "dns" { if canUseCgo && !src.standardCriteria() { // non-standard; let libc deal with it. @@ -371,6 +374,8 @@ func (c *conf) lookupOrder(r *Resolver, hostname string) (ret hostLookupOrder, d if src.source == "files" { filesSource = true } else { + hasDNSSource = true + hasDNSSourceChecked = true dnsSource = true } if first == "" { @@ -424,16 +429,25 @@ func (c *conf) lookupOrder(r *Resolver, hostname string) (ret hostLookupOrder, d } } - unknownSource = true - if first == "" { - first = src.source + if !hasDNSSourceChecked { + hasDNSSourceChecked = true + for _, v := range srcs[i+1:] { + if v.source == "dns" { + hasDNSSource = true + break + } + } } - } - // If we saw a source we don't recognize, which can only - // happen if we can't use the cgo resolver, treat it as DNS. - if unknownSource { - dnsSource = true + // If we saw a source we don't recognize, which can only + // happen if we can't use the cgo resolver, treat it as DNS, + // but only when there is no dns in all other sources. + if !hasDNSSource { + dnsSource = true + if first == "" { + first = "dns" + } + } } // Cases where Go can handle it without cgo and C thread overhead, diff --git a/src/net/conf_test.go b/src/net/conf_test.go index d2cdac8083..0f324b245a 100644 --- a/src/net/conf_test.go +++ b/src/net/conf_test.go @@ -364,6 +364,26 @@ func TestConfHostLookupOrder(t *testing.T) { {"x.com", "myhostname", hostLookupDNSFiles}, }, }, + { + name: "dns-among-unknown-sources", + resolver: &Resolver{PreferGo: true}, + c: &conf{}, + resolv: defaultResolvConf, + nss: nssStr(t, "hosts: mymachines files dns"), + hostTests: []nssHostTest{ + {"x.com", "myhostname", hostLookupFilesDNS}, + }, + }, + { + name: "dns-among-unknown-sources-2", + resolver: &Resolver{PreferGo: true}, + c: &conf{}, + resolv: defaultResolvConf, + nss: nssStr(t, "hosts: dns mymachines files"), + hostTests: []nssHostTest{ + {"x.com", "myhostname", hostLookupDNSFiles}, + }, + }, } origGetHostname := getHostname |