From f2d9d153ce73c5c579a39604260b1abfa97cfef4 Mon Sep 17 00:00:00 2001 From: Anfernee Gui Date: Tue, 22 Aug 2017 11:19:45 -0700 Subject: [PATCH] ';' in resolv.conf also means comment Skip ';'-prefixed lines in /etc/resolv.conf as well. --- core/pkg/net/dns/dns.go | 2 +- core/pkg/net/dns/dns_test.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/pkg/net/dns/dns.go b/core/pkg/net/dns/dns.go index e404ac07e..1249f7910 100644 --- a/core/pkg/net/dns/dns.go +++ b/core/pkg/net/dns/dns.go @@ -38,7 +38,7 @@ func GetSystemNameServers() ([]net.IP, error) { lines := strings.Split(string(file), "\n") for l := range lines { trimmed := strings.TrimSpace(lines[l]) - if strings.HasPrefix(trimmed, "#") { + if len(trimmed) == 0 || trimmed[0] == '#' || trimmed[0] == ';' { continue } fields := strings.Fields(trimmed) diff --git a/core/pkg/net/dns/dns_test.go b/core/pkg/net/dns/dns_test.go index 1b99da1d7..979d65c32 100644 --- a/core/pkg/net/dns/dns_test.go +++ b/core/pkg/net/dns/dns_test.go @@ -40,6 +40,8 @@ func TestGetDNSServers(t *testing.T) { defer os.Remove(file.Name()) ioutil.WriteFile(file.Name(), []byte(` + # comment + ; comment nameserver 2001:4860:4860::8844 nameserver 2001:4860:4860::8888 nameserver 8.8.8.8