From 29dc1cceffa66ad71c7dd7a769d3a005b5926fec Mon Sep 17 00:00:00 2001
From: Harry Harpham <harry@tailscale.com>
Date: Fri, 9 Jan 2026 12:54:39 -0700
Subject: [PATCH] tsnet: clean up related to
 3c1be083a480e4f55d0224c0b98f90c12257db11

Addresses a few comments left after merging
https://github.com/tailscale/tailscale/pull/18376

Updates #cleanup
Signed-off-by: Harry Harpham <harry@tailscale.com>
---
 tsnet/tsnet.go | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/tsnet/tsnet.go b/tsnet/tsnet.go
index d2810c0b2..9efad32b3 100644
--- a/tsnet/tsnet.go
+++ b/tsnet/tsnet.go
@@ -1468,8 +1468,8 @@ func (a addr) String() string  { return a.ln.addr }
 // cleanupListener wraps a net.Listener with a function to be run on Close.
 type cleanupListener struct {
 	net.Listener
-	cleanup     func() error
 	cleanupOnce sync.Once
+	cleanup     func() error // nil if unused
 }
 
 func (cl *cleanupListener) Close() error {
@@ -1479,15 +1479,5 @@ func (cl *cleanupListener) Close() error {
 			cleanupErr = cl.cleanup()
 		}
 	})
-	closeErr := cl.Listener.Close()
-	switch {
-	case closeErr != nil && cleanupErr != nil:
-		return fmt.Errorf("%w; also: %w", closeErr, cleanupErr)
-	case closeErr != nil:
-		return closeErr
-	case cleanupErr != nil:
-		return cleanupErr
-	default:
-		return nil
-	}
+	return errors.Join(cl.Listener.Close(), cleanupErr)
 }