From: Russ Cox <rsc@golang.org>
Date: Wed, 6 Jan 2016 19:37:45 +0000 (-0500)
Subject: net: fix hostLookupOrder("")
X-Git-Tag: go1.7beta1~320
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=fafd792de30f46cbd822fd6bb041c60c7b5fbe6d;p=gostls13.git

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 48372e5197..eb729167f5 100644
--- 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 8f39847804..ec8814b845 100644
--- 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
 			},
 		},
 		{