From: Russ Cox <rsc@golang.org>
Date: Wed, 11 Nov 2009 01:09:33 +0000 (-0800)
Subject: net: fix dns bug reported on irc.
X-Git-Tag: weekly.2009-11-10.1~15
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=484f46daea9a44afd9fc0ea90b2172dfa524d9bb;p=gostls13.git

net: fix dns bug reported on irc.

if suffixes don't work, check for name directly.
also fixes short names like bit.ly when ndots>1.

tested by tossing domain and search lines from /etc/resolv.conf

Fixes #2.

R=agl, agl1
CC=golang-dev
https://golang.org/cl/152048
---

diff --git a/src/pkg/net/dnsclient.go b/src/pkg/net/dnsclient.go
index bea31c3ceb..064e1017bf 100644
--- a/src/pkg/net/dnsclient.go
+++ b/src/pkg/net/dnsclient.go
@@ -268,5 +268,16 @@ func LookupHost(name string) (cname string, addrs []string, err os.Error) {
 			return;
 		}
 	}
+
+	// Last ditch effort: try unsuffixed.
+	rname := name;
+	if !rooted {
+		rname += "."
+	}
+	addrs, err = tryOneName(cfg, rname);
+	if err == nil {
+		cname = rname;
+		return;
+	}
 	return;
 }
diff --git a/src/pkg/net/net_test.go b/src/pkg/net/net_test.go
index 532a62b985..c06a05b3ef 100644
--- a/src/pkg/net/net_test.go
+++ b/src/pkg/net/net_test.go
@@ -35,7 +35,7 @@ var dialErrorTests = []DialErrorTest{
 	},
 	DialErrorTest{
 		"tcp", "", "no-such-name:80",
-		`dial tcp no-such-name:80: lookup no-such-name\..*\.( on .*)?: no (.*)`,
+		`dial tcp no-such-name:80: lookup no-such-name\.(.*\.)?( on .*)?: no (.*)`,
 	},
 	DialErrorTest{
 		"tcp", "", "mh/astro/r70:http",