From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 14 May 2021 05:20:32 +0000 (+0000)
Subject: upstream: fix previous: test saved no_shell_flag, not the one that just
X-Git-Tag: V_8_7_P1~198
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5953c143008259d87342fb5155bd0b8835ba88e5;p=thirdparty%2Fopenssh-portable.git

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 65a0ee2a8..fd67b841a 100644
--- 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;
 	}