Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v14] Remove client side port guessing from tsh puttyconfig #44574

Merged
merged 1 commit into from
Jul 24, 2024
Merged

[v14] Remove client side port guessing from tsh puttyconfig #44574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions tool/tsh/common/putty_config_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ const puttyRegistrySSHHostCAsKey = puttyRegistryKey + `\SshHostCAs`
const puttyProtocol = `ssh`

// ints
const puttyDefaultSSHPort = 3022
const puttyDefaultProxyPort = 0 // no need to set the proxy port as it's abstracted by `tsh proxy ssh`

// dwords
Expand Down Expand Up @@ -85,11 +84,6 @@ func addPuTTYSession(proxyHostname string, hostname string, port int, login stri
}
registryKey := fmt.Sprintf(`%v\%v`, puttyRegistrySessionsKey, puttySessionName)

// if the port passed is 0, this means "use server default" so we override it to 3022
if port == 0 {
port = puttyDefaultSSHPort
}

sessionDwords := puttyRegistrySessionDwords{
Present: puttyDwordPresent,
PortNumber: port,
Expand Down
Loading