wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2025-01-07 06:26:51 +03:00
Code Issues Projects Releases Wiki Activity

Don't pass ProxyCommand, just look it up

Browse Source 
It doesn't make much sense to pass this value, especially
after adding the ProxyUseFDpass functionality, which
accesses the config directly anyway.
This commit is contained in:
Sean Estabrooks 2024-09-07 06:16:36 -04:00 committed by Wez Furlong
parent caf450b873
commit 1e4dcf0244
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wezterm-ssh/src/sessioninner.rs
View File

@ -205,8 +205,7 @@ impl SessionInner {
sess.set_option(libssh_rs::SshOption::HostKeys(host_key.to_string()))?;
}
let (sock, _child) =
self.connect_to_host(&hostname, port, verbose, self.config.get("proxycommand"))?;
let (sock, _child) = self.connect_to_host(&hostname, port, verbose)?;
let raw = {
#[cfg(unix)]
{
@ -288,8 +287,7 @@ impl SessionInner {
))))
.context("notifying user of banner")?;
let (sock, _child) =
self.connect_to_host(&hostname, port, verbose, self.config.get("proxycommand"))?;
let (sock, _child) = self.connect_to_host(&hostname, port, verbose)?;
let mut sess = ssh2::Session::new()?;
if verbose {
@ -331,9 +329,8 @@ impl SessionInner {
hostname: &str,
port: u16,
verbose: bool,
proxy_command: Option<&String>,
) -> anyhow::Result<(Socket, Option<KillOnDropChild>)> {
match proxy_command.map(|s| s.as_str()) {
match self.config.get("proxycommand").map(|s| s.as_str()) {
Some("none") | None => {}
Some(proxy_command) => {
let mut cmd;