net: fix hostLookupOrder("")

Fixes #13623.

Change-Id: I1bd96aa7b6b715e4dbdcf0c37c2d29228df6565c
Reviewed-on: https://go-review.googlesource.com/18329
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/net/conf.go b/src/net/conf.go
index 48372e51974e3cf1107a22fbd4a77d445c9bfb52..eb729167f5b21646c1d1bbc38e09b1533a89cae8 100644 (file)
--- a/src/net/conf.go
+++ b/src/net/conf.go
@@ -220,7 +220,7 @@ func (c *conf) hostLookupOrder(hostname string) (ret hostLookupOrder) {
        var first string
        for _, src := range srcs {
                if src.source == "myhostname" {
-                       if hasDot {
+                       if hostname == "" || hasDot {
                                continue
                        }
                        return fallbackOrder

diff --git a/src/net/conf_test.go b/src/net/conf_test.go
index 8f398478041384ef5df6ad5507ea7f177fd60570..ec8814b845b738edce7dffcf54be32b06f673293 100644 (file)
--- a/src/net/conf_test.go
+++ b/src/net/conf_test.go
@@ -257,6 +257,7 @@ func TestConfHostLookupOrder(t *testing.T) {
                        hostTests: []nssHostTest{
                                {"x.com", hostLookupFilesDNS},
                                {"somehostname", hostLookupCgo},
+                               {"", hostLookupFilesDNS}, // Issue 13623
                        },
                },
                {