From 26ab9beb77ecd183b9c2ab3f8fcd245b92fba0e1 Mon Sep 17 00:00:00 2001
From: djm <djm@openbsd.org>
Date: Sat, 17 Jul 2021 00:36:53 +0000
Subject: [PATCH] fix sftp on ControlPersist connections, broken by recent
 SessionType change; spotted by sthen@

---
 usr.bin/ssh/ssh.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index 8e021648226..408236b2463 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/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 <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1715,6 +1715,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;
-- 
2.20.1