From ca283ac899381775cdc5be5d9779d5d4421b70f3 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 20 Apr 2021 16:19:34 -0700 Subject: [PATCH] net/dns: remove config in openresolv when given an empty DNS config. Part of #1720. Signed-off-by: David Anderson --- net/dns/openresolv.go | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/net/dns/openresolv.go b/net/dns/openresolv.go index 552615d07..88d0872fb 100644 --- a/net/dns/openresolv.go +++ b/net/dns/openresolv.go @@ -19,7 +19,20 @@ func newOpenresolvManager() (openresolvManager, error) { return openresolvManager{}, nil } +func (m openresolvManager) deleteTailscaleConfig() error { + cmd := exec.Command("resolvconf", "-f", "-d", "tailscale") + out, err := cmd.CombinedOutput() + if err != nil { + return fmt.Errorf("running %s: %s", cmd, out) + } + return nil +} + func (m openresolvManager) SetDNS(config OSConfig) error { + if config.IsZero() { + return m.deleteTailscaleConfig() + } + var stdin bytes.Buffer writeResolvConf(&stdin, config.Nameservers, config.SearchDomains) @@ -75,10 +88,5 @@ func (m openresolvManager) GetBaseConfig() (OSConfig, error) { } func (m openresolvManager) Close() error { - cmd := exec.Command("resolvconf", "-f", "-d", "tailscale") - out, err := cmd.CombinedOutput() - if err != nil { - return fmt.Errorf("running %s: %s", cmd, out) - } - return nil + return m.deleteTailscaleConfig() }