From c21bbc94a16b24c5c2c9d93dc82ed107412c8d98 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Mon, 25 Sep 2023 05:13:35 -0700
Subject: [PATCH] cmd/tailscale: prefer showing Sharer user over Owner user

Fixes tailscale/corp#14056
Updates tailscale/tailscale#8967

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
---
 cmd/tailscale/main.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cmd/tailscale/main.go b/cmd/tailscale/main.go
index a721dea..e1285a9 100644
--- a/cmd/tailscale/main.go
+++ b/cmd/tailscale/main.go
@@ -1085,9 +1085,10 @@ func (a *App) updateState(act jni.Object, state *clientState) {
 				continue
 			}
 		}
-		users[p.User()] = struct{}{}
+		uid := p.SharerOrUser()
+		users[uid] = struct{}{}
 		uiPeers = append(uiPeers, UIPeer{
-			Owner: p.User(),
+			Owner: uid,
 			Peer:  p.AsStruct(),
 		})
 	}