diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2021-05-14 05:20:33 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2021-05-14 05:20:33 +0000 |
| commit | 1798b367f570a80b57959aa012076951bd499777 (patch) | |
| tree | b63fb1cc8579520a0d1acd39fafce70f2a0e692c /usr.bin | |
| parent | 6e1b3aa08534272911bc5c98fdcbdb086167aec6 (diff) | |
fix previous: test saved no_shell_flag, not the one that just got
clobbered
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 610d8c8b142..c80276a7c1e 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -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 @@ -2126,7 +2126,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; } |