From dec01ef22bcce180bbdd70c6b7027900f0fd79d7 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Mon, 15 Feb 2021 11:19:22 -0800 Subject: [PATCH] safesocket: make ConnectDefault use paths pkg, fixing tailscaled-on-macOS Signed-off-by: Brad Fitzpatrick --- cmd/tailscale/depaware.txt | 2 +- safesocket/safesocket.go | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/tailscale/depaware.txt b/cmd/tailscale/depaware.txt index 7bd833cec..4fb8d7d6c 100644 --- a/cmd/tailscale/depaware.txt +++ b/cmd/tailscale/depaware.txt @@ -33,7 +33,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep tailscale.com/net/tlsdial from tailscale.com/derp/derphttp tailscale.com/net/tsaddr from tailscale.com/net/interfaces 💣 tailscale.com/net/tshttpproxy from tailscale.com/derp/derphttp+ - tailscale.com/paths from tailscale.com/cmd/tailscale/cli + tailscale.com/paths from tailscale.com/cmd/tailscale/cli+ tailscale.com/safesocket from tailscale.com/cmd/tailscale/cli 💣 tailscale.com/syncs from tailscale.com/net/interfaces+ tailscale.com/tailcfg from tailscale.com/cmd/tailscale/cli+ diff --git a/safesocket/safesocket.go b/safesocket/safesocket.go index 19e183463..5cbf73770 100644 --- a/safesocket/safesocket.go +++ b/safesocket/safesocket.go @@ -10,6 +10,8 @@ import ( "errors" "net" "runtime" + + "tailscale.com/paths" ) type closeable interface { @@ -31,7 +33,7 @@ func ConnCloseWrite(c net.Conn) error { // ConnectDefault connects to the local Tailscale daemon. func ConnectDefault() (net.Conn, error) { - return Connect("/var/run/tailscale/tailscaled.sock", 41112) + return Connect(paths.DefaultTailscaledSocket(), 41112) } // Connect connects to either path (on Unix) or the provided localhost port (on Windows).