From: djm@openbsd.org <djm@openbsd.org>
Date: Mon, 17 May 2021 11:43:16 +0000 (+0000)
Subject: upstream: fix breakage of -W forwaring introduced in 1.554; reported by
X-Git-Tag: V_8_7_P1~195
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4902e1a653c67fea850ec99c7537f358904c0af;p=thirdparty%2Fopenssh-portable.git

upstream: fix breakage of -W forwaring introduced in 1.554; reported by

naddy@ and sthen@, ok sthen@

OpenBSD-Commit-ID: f72558e643a26dc4150cff6e5097b5502f6c85fd
---

diff --git a/ssh.c b/ssh.c
index fd67b841a..696dc3bca 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.555 2021/05/14 05:20:32 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.556 2021/05/17 11:43:16 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2147,7 +2147,8 @@ 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 && !ono_shell_flag)
+		if (!fork_after_authentication_flag &&
+		    (!ono_shell_flag || options.stdio_forward_host != NULL))
 			need_controlpersist_detach = 1;
 		fork_after_authentication_flag = 1;
 	}