diff options
| author | Avery Pennarun <apenwarr@tailscale.com> | 2021-05-05 23:16:44 -0400 |
|---|---|---|
| committer | Avery Pennarun <apenwarr@tailscale.com> | 2021-05-12 23:05:36 -0400 |
| commit | fc2e6c7d7173487464dac07c39080d423a1f454d (patch) | |
| tree | 43181f5347bca147af9505ce3d4034ba60f615a7 | |
| parent | c6756a82c32ca75b47917702f95ffe1067685266 (diff) | |
| download | tailscale-apenwarr/fixes.tar.xz tailscale-apenwarr/fixes.zip | |
controlclient: update Persist.LoginName when it changes.apenwarr/fixes
Well, that was anticlimactic.
Fixes tailscale/corp#461.
Signed-off-by: Avery Pennarun <apenwarr@tailscale.com>
| -rw-r--r-- | control/controlclient/direct.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/control/controlclient/direct.go b/control/controlclient/direct.go index 5e522ed93..3ebc2d29e 100644 --- a/control/controlclient/direct.go +++ b/control/controlclient/direct.go @@ -460,10 +460,10 @@ func (c *Direct) doLogin(ctx context.Context, opt loginOpt) (mustRegen bool, new request.NodeKey.ShortString()) return true, "", nil } - if persist.Provider == "" { + if resp.Login.Provider != "" { persist.Provider = resp.Login.Provider } - if persist.LoginName == "" { + if resp.Login.LoginName != "" { persist.LoginName = resp.Login.LoginName } |