From c47e5372b5c1e186a33e89e6c029fab1b9b95e8c Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 15 Mar 2022 15:54:48 +0530 Subject: [PATCH] native askpass should be used when requested --- kittens/ssh/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kittens/ssh/main.py b/kittens/ssh/main.py index 8f5b7bcc6..6ed50e26b 100644 --- a/kittens/ssh/main.py +++ b/kittens/ssh/main.py @@ -573,11 +573,11 @@ def run_ssh(ssh_args: List[str], server_args: List[str], found_extra_args: Tuple use_kitty_askpass = host_opts.askpass == 'native' or (host_opts.askpass == 'unless-set' and 'SSH_ASKPASS' not in os.environ) need_to_request_data = True if use_kitty_askpass: - # SSH_ASKPASS_REQUIRE was introduced in 8.4 release on 2020-09-27 if os.environ.get('DISPLAY') or ssh_version() >= (8, 4): + # SSH_ASKPASS_REQUIRE was introduced in 8.4 release on 2020-09-27 need_to_request_data = False os.environ['SSH_ASKPASS_REQUIRE'] = 'force' - os.environ['SSH_ASKPASS'] = os.path.join(shell_integration_dir, 'ssh', 'askpass.py') + os.environ['SSH_ASKPASS'] = os.path.join(shell_integration_dir, 'ssh', 'askpass.py') with restore_terminal_state() as echo_on: rcmd, replacements, shm_name = get_remote_command( remote_args, host_opts, hostname, hostname_for_match, uname, echo_on, request_data=need_to_request_data)