net/dns: remove a tiny wrapper function that isn't contributing anything.

Signed-off-by: David Anderson <danderson@tailscale.com>
pull/3173/head
David Anderson 3 years ago committed by Dave Anderson
parent 10745c099a
commit 422ea4980f

@ -84,11 +84,6 @@ func (m directManager) readResolvFile(path string) (OSConfig, error) {
return readResolv(bytes.NewReader(b)) return readResolv(bytes.NewReader(b))
} }
// readResolvConf reads DNS configuration from /etc/resolv.conf.
func (m directManager) readResolvConf() (OSConfig, error) {
return m.readResolvFile(resolvConf)
}
// resolvOwner returns the apparent owner of the resolv.conf // resolvOwner returns the apparent owner of the resolv.conf
// configuration in bs - one of "resolvconf", "systemd-resolved" or // configuration in bs - one of "resolvconf", "systemd-resolved" or
// "NetworkManager", or "" if no known owner was found. // "NetworkManager", or "" if no known owner was found.

@ -68,7 +68,7 @@ func isResolvedActive() bool {
return false return false
} }
config, err := newDirectManager().readResolvConf() config, err := newDirectManager().readResolvFile(resolvConf)
if err != nil { if err != nil {
return false return false
} }

Loading…
Cancel
Save