Remove LoginFlags from Backend options.

- It was only used in one currently-unused client.
- It's an imperative command, not a configuration setting.
- The LoginFlags stuff in controlclient feels like it needs
  a refactor anyway.

I'll put this logic back once ipnd owns its state and Backend
commands reflect that.

Signed-Off-By: David Anderson <dave@natulte.net>
This commit is contained in:
David Anderson
2020-02-03 10:57:34 -08:00
committed by Dave Anderson
parent b5346fe7b4
commit f6f154193f
4 changed files with 5 additions and 13 deletions
+2 -2
View File
@@ -5,10 +5,11 @@
package ipn
import (
"time"
"tailscale.com/control/controlclient"
"tailscale.com/tailcfg"
"tailscale.com/wgengine"
"time"
)
type State int
@@ -53,7 +54,6 @@ type Options struct {
FrontendLogID string // public logtail id used by frontend
ServerURL string
Prefs Prefs
LoginFlags controlclient.LoginFlags
Notify func(n Notify) `json:"-"`
}
-1
View File
@@ -177,7 +177,6 @@ func newNode(t *testing.T, prefix string, https *httptest.Server) testNode {
WantRunning: true,
Persist: &c,
},
LoginFlags: controlclient.LoginDefault,
Notify: func(n Notify) {
// Automatically visit auth URLs
if n.BrowseToURL != nil {
+1 -1
View File
@@ -253,7 +253,7 @@ func (b *LocalBackend) Start(opts Options) error {
b.logf("Backend: logs: be:%v fe:%v\n", blid, opts.FrontendLogID)
b.send(Notify{BackendLogID: &blid})
cli.Login(nil, opts.LoginFlags)
cli.Login(nil, controlclient.LoginDefault)
return nil
}