TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-22 08:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2021-10-06 16:57:02 -07:00 committed by Dave Anderson
parent 10745c099a
commit 422ea4980f
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/dns/direct.go
View File

@ -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.

2
net/dns/resolved.go
View File

@ -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
} }