From ad8d6628c4910ac81ed3227f4fa4231124e6e892 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 8 Mar 2020 22:54:48 +0100 Subject: ... --- notmuch-ssh-client | 2 +- notmuch-ssh-server | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/notmuch-ssh-client b/notmuch-ssh-client index 6983fbe..d35a68a 100644 --- a/notmuch-ssh-client +++ b/notmuch-ssh-client @@ -3,4 +3,4 @@ instance=${NOTMUCH_INSTANCE:-mail} host=${NOTMUCH_HOST:-notmuch.odin} -exec -- @openssh@/bin/ssh ${host} -- ${instance} $@ +exec -- @openssh@/bin/ssh -o ControlPath=none ${host} -- ${instance} $@ diff --git a/notmuch-ssh-server b/notmuch-ssh-server index 6a7a2ed..493bf02 100644 --- a/notmuch-ssh-server +++ b/notmuch-ssh-server @@ -25,6 +25,6 @@ if len(original_command) < 1: config_section = original_command[0] -command_environment = config.items(config_section) if config.has_section(config_section) else config.items(config.default_section) +command_environment = config[config_section] if config.has_section(config_section) else config[config.default_section] os.execvpe('@notmuch@/bin/notmuch', original_command[1:], command_environment) -- cgit v1.2.3