upstream: fix previous: test saved no_shell_flag, not the one that just

got clobbered

OpenBSD-Commit-ID: b8deace085d9d941b2d02f810243b9c302e5355d
This commit is contained in:
djm@openbsd.org 2021-05-14 05:20:32 +00:00 committed by Damien Miller
parent 1e9fa55f4d
commit 5953c14300
1 changed files with 2 additions and 2 deletions

4
ssh.c
View File

@ -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;
}