diff options
| author | Tom DNetto <tom@tailscale.com> | 2022-11-23 11:19:30 -0800 |
|---|---|---|
| committer | Tom <twitchyliquid64@users.noreply.github.com> | 2022-11-28 10:39:04 -0800 |
| commit | 5c8d2fa69598ced697c192c024d9dbf58991ab2f (patch) | |
| tree | c8c86770dcc0aa9315e5ca587fdd63cd76c6aa61 /client | |
| parent | e8cc78b1afdd4b7358c39b8cfbfcd7ae7faf3bd3 (diff) | |
| download | tailscale-5c8d2fa69598ced697c192c024d9dbf58991ab2f.tar.xz tailscale-5c8d2fa69598ced697c192c024d9dbf58991ab2f.zip | |
cmd/tailscale,ipn: improve UX of lock init command, cosmetic changes
Signed-off-by: Tom DNetto <tom@tailscale.com>
Diffstat (limited to 'client')
| -rw-r--r-- | client/tailscale/localclient.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/client/tailscale/localclient.go b/client/tailscale/localclient.go index 2e2f6800f..9d006303d 100644 --- a/client/tailscale/localclient.go +++ b/client/tailscale/localclient.go @@ -787,14 +787,15 @@ func (lc *LocalClient) NetworkLockStatus(ctx context.Context) (*ipnstate.Network // NetworkLockInit initializes the tailnet key authority. // // TODO(tom): Plumb through disablement secrets. -func (lc *LocalClient) NetworkLockInit(ctx context.Context, keys []tka.Key, disablementValues [][]byte) (*ipnstate.NetworkLockStatus, error) { +func (lc *LocalClient) NetworkLockInit(ctx context.Context, keys []tka.Key, disablementValues [][]byte, supportDisablement []byte) (*ipnstate.NetworkLockStatus, error) { var b bytes.Buffer type initRequest struct { - Keys []tka.Key - DisablementValues [][]byte + Keys []tka.Key + DisablementValues [][]byte + SupportDisablement []byte } - if err := json.NewEncoder(&b).Encode(initRequest{Keys: keys, DisablementValues: disablementValues}); err != nil { + if err := json.NewEncoder(&b).Encode(initRequest{Keys: keys, DisablementValues: disablementValues, SupportDisablement: supportDisablement}); err != nil { return nil, err } |