From 43ec991a782791d0b3f42898cd789f99a07bfaa4 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Sat, 17 Jul 2021 00:36:53 +0000 Subject: upstream: fix sftp on ControlPersist connections, broken by recent SessionType change; spotted by sthen@ OpenBSD-Commit-ID: 4c5ddc5698790ae6ff50d2a4f8f832f0eeeaa234 --- ssh.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ssh.c') diff --git a/ssh.c b/ssh.c index 710c4e9a..0583e916 100644 --- a/ssh.c +++ b/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.560 2021/07/13 23:48:36 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.561 2021/07/17 00:36:53 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1736,6 +1736,7 @@ control_persist_detach(void) stdin_null_flag = ostdin_null_flag; options.request_tty = orequest_tty; tty_flag = otty_flag; + options.session_type = osession_type; close(muxserver_sock); muxserver_sock = -1; options.control_master = SSHCTL_MASTER_NO; -- cgit v1.2.1