diff options
| author | Brad Fitzpatrick <bradfitz@tailscale.com> | 2020-07-22 10:31:28 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@tailscale.com> | 2020-07-22 10:35:35 -0700 |
| commit | de11f90d9d740fb3efd36deae7898ac491f4c19e (patch) | |
| tree | b060d4b838daf0671ee2c12d4a7a29fed876ed1d | |
| parent | 972a42cb33d16eb11b6f51ca2fc991a811866af0 (diff) | |
| download | tailscale-de11f90d9d740fb3efd36deae7898ac491f4c19e.tar.xz tailscale-de11f90d9d740fb3efd36deae7898ac491f4c19e.zip | |
ipn: remove unused parameter to func LoadPrefs, fix godoc subject
| -rw-r--r-- | ipn/local.go | 2 | ||||
| -rw-r--r-- | ipn/prefs.go | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ipn/local.go b/ipn/local.go index 3b9bef3d1..c9759cb65 100644 --- a/ipn/local.go +++ b/ipn/local.go @@ -580,7 +580,7 @@ func (b *LocalBackend) loadStateLocked(key StateKey, prefs *Prefs, legacyPath st if err != nil { if errors.Is(err, ErrStateNotExist) { if legacyPath != "" { - b.prefs, err = LoadPrefs(legacyPath, true) + b.prefs, err = LoadPrefs(legacyPath) if err != nil { b.logf("Failed to load legacy prefs: %v", err) b.prefs = NewPrefs() diff --git a/ipn/prefs.go b/ipn/prefs.go index 7de645c50..c10ffbdba 100644 --- a/ipn/prefs.go +++ b/ipn/prefs.go @@ -217,10 +217,9 @@ func (p *Prefs) Clone() *Prefs { return p2 } -// LoadLegacyPrefs loads a legacy relaynode config file into Prefs -// with sensible migration defaults set. If enforceDefaults is true, -// Prefs.RouteAll and Prefs.AllowSingleHosts are forced on. -func LoadPrefs(filename string, enforceDefaults bool) (*Prefs, error) { +// LoadPrefs loads a legacy relaynode config file into Prefs +// with sensible migration defaults set. +func LoadPrefs(filename string) (*Prefs, error) { data, err := ioutil.ReadFile(filename) if err != nil { return nil, fmt.Errorf("loading prefs from %q: %v", filename, err) |