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

ipn: remove unused parameter to func LoadPrefs, fix godoc subject

Browse Source
This commit is contained in:
Brad Fitzpatrick 2020-07-22 10:31:28 -07:00
parent 972a42cb33
commit de11f90d9d
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipn/local.go
View File

@ -580,7 +580,7 @@ func (b *LocalBackend) loadStateLocked(key StateKey, prefs *Prefs, legacyPath st
if err != nil { if err != nil {
if errors.Is(err, ErrStateNotExist) { if errors.Is(err, ErrStateNotExist) {
if legacyPath != "" { if legacyPath != "" {
b.prefs, err = LoadPrefs(legacyPath, true) b.prefs, err = LoadPrefs(legacyPath)
if err != nil { if err != nil {
b.logf("Failed to load legacy prefs: %v", err) b.logf("Failed to load legacy prefs: %v", err)
b.prefs = NewPrefs() b.prefs = NewPrefs()

7
ipn/prefs.go
View File

@ -217,10 +217,9 @@ func (p *Prefs) Clone() *Prefs {
return p2 return p2
} }
// LoadLegacyPrefs loads a legacy relaynode config file into Prefs // LoadPrefs loads a legacy relaynode config file into Prefs
// with sensible migration defaults set. If enforceDefaults is true, // with sensible migration defaults set.
// Prefs.RouteAll and Prefs.AllowSingleHosts are forced on. func LoadPrefs(filename string) (*Prefs, error) {
func LoadPrefs(filename string, enforceDefaults bool) (*Prefs, error) {
data, err := ioutil.ReadFile(filename) data, err := ioutil.ReadFile(filename)
if err != nil { if err != nil {
return nil, fmt.Errorf("loading prefs from %q: %v", filename, err) return nil, fmt.Errorf("loading prefs from %q: %v", filename, err)