TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-16 03:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/dns/resolvd: properly handle not having "search" entries

Browse Source 
This prevents adding an empty "search" line when no search domains are set.

Signed-off-by: Aaron Bieber <aaron@bolddaemon.com>
This commit is contained in:
Aaron Bieber 2022-01-28 05:18:58 -07:00 committed by Brad Fitzpatrick
parent bd90781b34
commit e5cd765e00
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/dns/resolvd.go
View File

@ -60,7 +60,9 @@ func (m *resolvdManager) SetDNS(config OSConfig) error {
newSearch = append(newSearch, s.WithoutTrailingDot()) newSearch = append(newSearch, s.WithoutTrailingDot())
} }
if len(newSearch) > 1 {
newResolvConf = append(newResolvConf, []byte(strings.Join(newSearch, " "))...) newResolvConf = append(newResolvConf, []byte(strings.Join(newSearch, " "))...)
}
err = m.fs.WriteFile(resolvConf, newResolvConf, 0644) err = m.fs.WriteFile(resolvConf, newResolvConf, 0644)
if err != nil { if err != nil {