diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2021-05-17 11:43:17 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2021-05-17 11:43:17 +0000 |
| commit | a97e37180f6212a7874ce8e96cffad699c93bbf3 (patch) | |
| tree | 67ce38604672698f0a0d0894754b61def6728568 /usr.bin/ssh/ssh.c | |
| parent | c65a9939fab879aa9814f8293f3ebddbf4f2573f (diff) | |
fix breakage of -W forwaring introduced in 1.554; reported by
naddy@ and sthen@, ok sthen@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index c80276a7c1e..45c0b87f5bc 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -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 @@ -2126,7 +2126,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; } |