Skip to content

[v11] tsh: Fix redundant error in PPK generation on relogin #23986

Merged
webvictim merged 2 commits intobranch/v11from
gus/v11/backport-23899
Apr 3, 2023
Merged

[v11] tsh: Fix redundant error in PPK generation on relogin #23986
webvictim merged 2 commits intobranch/v11from
gus/v11/backport-23899

Conversation

@webvictim
Copy link
Copy Markdown
Contributor

Backport #23899 to branch/v11

The logic for when we outputted an error was not very sound. Reworked it.

Fixes #23778

Co-authored-by: Zac Bergquist <zac.bergquist@goteleport.com>
@webvictim webvictim self-assigned this Apr 3, 2023
@webvictim webvictim enabled auto-merge April 3, 2023 13:22
@github-actions github-actions Bot requested review from tigrato and zmb3 April 3, 2023 13:22
@webvictim webvictim added this pull request to the merge queue Apr 3, 2023
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Apr 3, 2023
@webvictim webvictim added this pull request to the merge queue Apr 3, 2023
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Apr 3, 2023
@webvictim webvictim added this pull request to the merge queue Apr 3, 2023
Merged via the queue into branch/v11 with commit aa1e821 Apr 3, 2023
@webvictim webvictim deleted the gus/v11/backport-23899 branch April 3, 2023 21:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants