|
|
@ -1088,8 +1088,8 @@ func (b *LocalBackend) loadStateLocked(key ipn.StateKey, prefs *ipn.Prefs, legac
|
|
|
|
|
|
|
|
|
|
|
|
b.logf("using backend prefs")
|
|
|
|
b.logf("using backend prefs")
|
|
|
|
bs, err := b.store.ReadState(key)
|
|
|
|
bs, err := b.store.ReadState(key)
|
|
|
|
if err != nil {
|
|
|
|
switch {
|
|
|
|
if errors.Is(err, ipn.ErrStateNotExist) {
|
|
|
|
case errors.Is(err, ipn.ErrStateNotExist):
|
|
|
|
if legacyPath != "" {
|
|
|
|
if legacyPath != "" {
|
|
|
|
b.prefs, err = ipn.LoadPrefs(legacyPath)
|
|
|
|
b.prefs, err = ipn.LoadPrefs(legacyPath)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
@ -1108,7 +1108,7 @@ func (b *LocalBackend) loadStateLocked(key ipn.StateKey, prefs *ipn.Prefs, legac
|
|
|
|
return fmt.Errorf("initMachineKeyLocked: %w", err)
|
|
|
|
return fmt.Errorf("initMachineKeyLocked: %w", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
case err != nil:
|
|
|
|
return fmt.Errorf("store.ReadState(%q): %v", key, err)
|
|
|
|
return fmt.Errorf("store.ReadState(%q): %v", key, err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
b.prefs, err = ipn.PrefsFromBytes(bs, false)
|
|
|
|
b.prefs, err = ipn.PrefsFromBytes(bs, false)
|
|
|
|