diff --git a/filedescriptor/src/windows.rs b/filedescriptor/src/windows.rs index 1bdd4dd65..7c9e5ad76 100644 --- a/filedescriptor/src/windows.rs +++ b/filedescriptor/src/windows.rs @@ -87,6 +87,7 @@ impl FromRawSocketDescriptor for T { } unsafe impl Send for OwnedHandle {} +unsafe impl Sync for OwnedHandle {} impl OwnedHandle { fn probe_handle_type_if_unknown(handle: RawHandle, handle_type: HandleType) -> HandleType { diff --git a/wezterm-ssh/src/config.rs b/wezterm-ssh/src/config.rs index 5dc9d3b6c..bf1f3f431 100644 --- a/wezterm-ssh/src/config.rs +++ b/wezterm-ssh/src/config.rs @@ -491,6 +491,7 @@ Config { r#" { "hostname": "random", + "identityfile": "/home/me/.ssh/id_dsa /home/me/.ssh/id_ecdsa /home/me/.ssh/id_ed25519 /home/me/.ssh/id_rsa", "port": "22", "something": "first", "user": "me", @@ -521,6 +522,7 @@ Config { r#" { "hostname": "a.b", + "identityfile": "/home/me/.ssh/id_dsa /home/me/.ssh/id_ecdsa /home/me/.ssh/id_ed25519 /home/me/.ssh/id_rsa", "port": "22", "something": "first", "user": "me", @@ -537,6 +539,7 @@ Config { "forwardagent": "no", "hostname": "b.b", "identityagent": "/home/me/.ssh/agent", + "identityfile": "/home/me/.ssh/id_dsa /home/me/.ssh/id_ecdsa /home/me/.ssh/id_ed25519 /home/me/.ssh/id_rsa", "port": "22", "something": "first", "user": "me", diff --git a/wezterm-ssh/src/pty.rs b/wezterm-ssh/src/pty.rs index b5c57be99..e9c292c30 100644 --- a/wezterm-ssh/src/pty.rs +++ b/wezterm-ssh/src/pty.rs @@ -75,6 +75,7 @@ impl portable_pty::MasterPty for SshPty { .map(|f| -> Box<(dyn Write + Send + 'static)> { Box::new(f) }) } + #[cfg(unix)] fn process_group_leader(&self) -> Option { // It's not local, so there's no meaningful leader None