diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2021-05-14 07:20:32 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-05-14 09:20:35 +0200 |
| commit | 5953c143008259d87342fb5155bd0b8835ba88e5 (patch) | |
| tree | 599f76702cab856d2397a07382274f8cde7e2267 /ssh.c | |
| parent | upstream: Fix ssh started with ControlPersist incorrectly executing a (diff) | |
| download | openssh-5953c143008259d87342fb5155bd0b8835ba88e5.tar.xz openssh-5953c143008259d87342fb5155bd0b8835ba88e5.zip | |
upstream: fix previous: test saved no_shell_flag, not the one that just
got clobbered
OpenBSD-Commit-ID: b8deace085d9d941b2d02f810243b9c302e5355d
Diffstat (limited to '')
| -rw-r--r-- | ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.554 2021/05/14 03:09:48 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.555 2021/05/14 05:20:32 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2147,7 +2147,7 @@ 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 && !no_shell_flag) + if (!fork_after_authentication_flag && !ono_shell_flag) need_controlpersist_detach = 1; fork_after_authentication_flag = 1; } |