RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-20 09:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream: fix sftp on ControlPersist connections, broken by recent

Browse Source 
SessionType change; spotted by sthen@

OpenBSD-Commit-ID: 4c5ddc5698790ae6ff50d2a4f8f832f0eeeaa234
This commit is contained in:
djm@openbsd.org 2021-07-17 00:36:53 +00:00 committed by Damien Miller
parent 073f45c236
commit 43ec991a78
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ssh.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1736,6 +1736,7 @@ control_persist_detach(void)
stdin_null_flag = ostdin_null_flag; stdin_null_flag = ostdin_null_flag;
options.request_tty = orequest_tty; options.request_tty = orequest_tty;
tty_flag = otty_flag; tty_flag = otty_flag;
options.session_type = osession_type;
close(muxserver_sock); close(muxserver_sock);
muxserver_sock = -1; muxserver_sock = -1;
options.control_master = SSHCTL_MASTER_NO; options.control_master = SSHCTL_MASTER_NO;