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

got clobbered

OpenBSD-Commit-ID: b8deace085d9d941b2d02f810243b9c302e5355d

diff --git a/ssh.c b/ssh.c
index 65a0ee2a89f2af9a8e42ed6b3098e7a62b1dbf80..fd67b841a9afa8a3ee42c6dcb4982c31dab8ec4e 100644 (file)
--- a/ssh.c
+++ b/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
@@ -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;
        }