diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2021-05-17 13:43:16 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-05-18 03:02:32 +0200 |
| commit | c4902e1a653c67fea850ec99c7537f358904c0af (patch) | |
| tree | f1f487d0b3002bee7bdaaa3821649935e21db073 /ssh.c | |
| parent | upstream: Regenerate moduli. (diff) | |
| download | openssh-c4902e1a653c67fea850ec99c7537f358904c0af.tar.xz openssh-c4902e1a653c67fea850ec99c7537f358904c0af.zip | |
upstream: fix breakage of -W forwaring introduced in 1.554; reported by
naddy@ and sthen@, ok sthen@
OpenBSD-Commit-ID: f72558e643a26dc4150cff6e5097b5502f6c85fd
Diffstat (limited to 'ssh.c')
| -rw-r--r-- | ssh.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.555 2021/05/14 05:20:32 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.556 2021/05/17 11:43:16 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2147,7 +2147,8 @@ ssh_session2(struct ssh *ssh, const struct ssh_conn_info *cinfo) stdin_null_flag = 1; no_shell_flag = 1; tty_flag = 0; - if (!fork_after_authentication_flag && !ono_shell_flag) + if (!fork_after_authentication_flag && + (!ono_shell_flag || options.stdio_forward_host != NULL)) need_controlpersist_detach = 1; fork_after_authentication_flag = 1; } |