From c12d8b9caa34b62ebb1f0ae84db567e2b0736d9d Mon Sep 17 00:00:00 2001 From: Dan Upton Date: Mon, 1 Sep 2025 16:41:35 +0100 Subject: [PATCH] MWI: Fix panic in SSH multiplexer Fixes a panic that would occur when: 1. Using the `ssh-multiplexer` service 2. Renewing the bot's identity fails on-startup 3. You kill `tbot` before it has a chance to successfully renew its identity changelog: Fix panic in `tbot`'s `ssh-multiplexer` service --- lib/tbot/services/ssh/multiplexer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tbot/services/ssh/multiplexer.go b/lib/tbot/services/ssh/multiplexer.go index 73dcffa9098af..48cce99d0fe6a 100644 --- a/lib/tbot/services/ssh/multiplexer.go +++ b/lib/tbot/services/ssh/multiplexer.go @@ -271,7 +271,7 @@ func (s *MultiplexerService) setup(ctx context.Context) ( select { case <-s.botIdentityReadyCh: case <-ctx.Done(): - return nil, nil, "", nil, nil + return nil, nil, "", nil, ctx.Err() } } }